Socket fix #1