Fix for msan crashes observed for mc streams