Fix channel selection