Analytics fix^2