fixed analytics infinite recursion