Resolves STREAMS-141

opening STREAMS-143 to address this issue