Fix broken streaming impl