Hopefully fixes overflow issues