Bug fix - Analytics