Circular dependency fixed.