Plug possible memory leak after 3961407