Fixing analytics (again)