Should finally fix the overflow issue