Bugfix 13659 new