Bugfix 13484