Fix an overflow issue