fix JT-18956