Possible analytics fix