Resolved circular dependency.