#JC-1407 fixed