Bugfix after Clean up