Bugfix 12489