Fix channel counting