Really fixing  analytics for  real this time