HW 2 fix