Trying to fix this weird overflow issue