workaround for JT-19362