merged class 4 exercise fix