BS-1379, fix on bigdecimal again