Fix Circular reference using directly the container