Fix bucket counter