#JC-1439 fixed