Fixed a bug with channel list handling