Change buckets to not fail when doing lookups