Fix BucketHandler