Fix for allchannel
Merge pull request #628 from egbertbouman/fix_channel

Fix for allchannel