Updated overflow issue