* [FIX] Issues with arithmetic.