Really fixed math this time