#JC-1408 bug fix