#JC-1484 bug fix