Fix issue with collection streams not available