Analytics fix