Fixed circular dependency.