Possible resolution to issue JBTM-1614