This presumably fixes Issue #248

And, apparently, everything else where Buffer Streams were involved.