Changed ints to BigDecimal