#JC-1437 fixed