JC-1706 fix