workaround for JT-24154