Channel numbering, fix for channel name uniqueness