fixed the overflow issue!