Channels bugfix