Updated hotfix