bugfix gor 774 refactored