Work around a stream-related hanging issue