Fix maths parsing - now it actually works!