Actually fixed overflow