#JC-1293 fixed