Adding fix for arithmetic.