HW 3 fix