Fix circular dependency