Merge "Removes fileno check to prevent valgrind error"