Fix JC-1682