Circular dependency fix