Bugfix 12809