Fixed dupe bug with Bucket