Fixed analytics tracking