fix the channel stuff