Fix channel switch by number (issue #3635)