#JC-1143 bug fixed