More leak plugs
Revert "fixup for 67d6c9f" and fix correctly

This reverts commit 8f2bde5fb013e800a8d3bd14de1ec87f90f5b360.
and fixes the problem correctly... at least no leaks are reported and no crash :p