Fixed the channel bug