Bugfix 11817 refactor