Slightly more correct buckets