Fixed bucket-change handling