Switched from double to BigDecimal