Fixing iteration through buckets