Another try at fixing analytics