Fix channel assign