Fixed circular dependency