Fixed bug from merge, start of level 4