bugfixes for lvl 2