Fixed analytics