Bugfix 12384