Bugfix 11828