Fix issue with BigDecimal in scala 2.11.x