We actually need to capture EOS outside the demux