Fix buckets