Bugfix 12885