Channel manager fix