* Fixes NB#90818, fixes a potential memory leak