Fallback fix for old Streams