Fix new stream logic