Added Dan's fd/socket fix.