Fixed channel selection bug