Bugfix 12612