In addition to fix the conditional when iterating the buckets, add a little protection to the memory allocation size
fluent
