Bugfix 12367