fix for 'stream' option