fix issue with BigDecimal, we should be able to directly use Scala.BigDecimal instead of using java.math.Decimal