channel: fix infinite recursion
Merge pull request #13 from cmr/master

channel: fix infinite recursion