Fix for JT-11021