Fix circular dependency.