Minor performance improvement in Channel