fix JT-18963