Bugfix 12569