fixing up handle-sockets