ChannelSelection: correctly correct channel number when pipzap