fix HW2 issue