fix JT-18955