Staring to fix TCPClient