#JC-1404 bug fixed