Fix channel dead race condition (another one)