Analytics fixed