Fix channel send connections

Fix #1147
Backwards compat should be maintained.