#JC-1286 bug fixed