Analytics hotfix