Fixed shell command handling, which was unintentionally broken by merging *_stream