Fix buckets not being checked properly.