Badly fix bucket issue