Analytics fix, hopefully