BS-1379, change long to bigdecimal