fixed cyclic dependencies