Fix channel changing bug