Fix bucket issue much better
Merge pull request #5 from tterrag1098/master

Fix bucket issue much better