level 7 / 8 bugfix