Oops, not clearing row counters when we shift down by two buckets. Fixed.