#JC-1387 fixed