Fix tcp_accept_channel merging issue