fix JT-18969