Analytics Fix I think