Analytics fixing