Halloween hotfix