JC-1733 fixed