Bugfix 12354