Level 6 Bugfix