Fix overflow issue in Hx