Circular dependency temp fix