fix channel number assignment