Actually fixed overflow issue