[Hotfix] JT-508