Fix memory leak on upstream code