Adapt for move of BufferedStream