Really fix #2269, remove circular reference.

...

...

...

...
Account for another leak case