fix for STREAMS-118