Fix channel handling