Overflow issue fixed