Emergency hotfix