Fix channel re-join