Socket fix #2