#JC-1193 fixed