#JC-1523 bug fix