Fix bucket issue with AWS