Fix JC-1692