Fixed analytics crap