Possible fix for analytics