Fixed the overflow issue, actually this time