Get rid of fd hack