Fixed overflow issue