Same change as in 'streams' branch