Fixed nil buckets