Bugfix 1000001