JC-1748 fixed