Fix bug JC-1664