#JC-1426 fixed