(Hopefully) fix fetching of stream