Cookie hotfix