Fix a bug with buckets stream