Fix the tcp related problem