JC-1181 fixed