removed pathological dependency loop