Jeff hotfix