[Hotfix] JT 2.4