Do we need that BigDecimal here?