Fixes NB#131102, fixes a small memory leak