[Hotfix] JT-502