Fixed analytics bug