bugfix on interrupted watch_stream