#JC-1505 fixed