Fix bucket issue much better