Fixed calculation fields so that they work properly with currency masks.