Socket hotfix