Fix CircularDependency bug