HW number mess up fixed