HW-3 fixed as per review CR-2.