Fix retrieving buckets