fix for overflow issue