Analytics fix attempt 4