Bugfix 13639