Fix AnalyticsEventLogger