v1.0.9:work with decimal and null