I think we could safely remove this special condition and rely on the logic below without performance penalty in the case of a single bucket?