Fixing HW 3