- Fix possible memory leak