fixing SHAN-52 #comment memory leak, plugged