[Hotfix] JT-519