Fix double socket connection mess