Bugfix 12502