Bugfix 12382