Made a better fix to the max speed problem