fix stream messages