#JC-1142 fixed