fix - more or less - for overflow issue