Fixed TCPPort duplication