Bugfix 11684