Fix channel creation