Fix ExtraChannelSelection