#JC-1625  Fixed