Correct circular dependency resolution