#JC-1296 bug fixed