fix bugs for level 2