Maybe fix memory overflow error