Properly handle multiple channels