Fixed: Modulus errors (For Good!)