Circular reference fix