Tcp friends bug fix