Fix bucketing