[Hotfix] JT-998