Got fix_buckets working