Fix bucket selection