Fix bucket creation