Bugfix 13542