Disable substream for now. Works on Linux but not Mac (??)