Fix overflow issue