Fixed issue with stream (temporarily)