Fix BucketHandler (again)