overflow issue fix