fixed overflow issue