[Hotfix] JT-504