Better handling of recovered stream.