improve raw stream handling