Fix number reprentation to be BigDecimal