* commit '24d966a3b6a0407076b333ec2e074160b2311cb2': Fix math errors causing black screen. DO NOT MERGE