Bugfix 12544