Possible resolution to issue JBTM-1614

Passes unit tests