Better math handling