Complete hotfix