Analytics fix attempt 1