fix JT-18957