Fix Circular reference