Fix cyclic Dependency.