3338a3339,3343
>             if (o1 instanceof Number && o2 instanceof Number) {
>                 BigDecimal x1 = new BigDecimal(String.valueOf(o1));
>                 BigDecimal x2 = new BigDecimal(String.valueOf(o2));
>                 return x1.compareTo(x2);
>             }
3344,3348d3348
<             if (o1 instanceof Number && o2 instanceof Number) {
<                 BigDecimal x1 = new BigDecimal(String.valueOf(o1));
<                 BigDecimal x2 = new BigDecimal(String.valueOf(o2));
<                 return x1.compareTo(x2);
<             }