Modified hotfix