Fix for JC-1179