Fix bucket is null because of variable shadowing

Fix bucket is null because of variable shadowing #22