Still fixing sockets