GS-11239 Fixed leaked node problems