fix cyclic references