Fixed math issues when numbers have commas