Another mem-leak fix