Bug after migration to channel-based connections