Bugfix 13621