Bug fix for channel streams