Merge pull request #3687 from xhaggi/fix-channel-numbers