fix the stream message parser