StreamChannel fix