Fix for Analytics.