JC-1692 Fix