Merge "fix fd leaking"