Fixed the overflow issue