fixing buckets