Fix to be consistent in usage of BigDecimal