Bugfix 9058