Fixed Analytics tracking