         let previousConfigure = configure
         configure = { [unowned self] _op in
             let op = previousConfigure?(_op) ?? _op
-            op.badgeValue = self.operation.badgeValue
+            op.badgeValue = self.badgeValue
             op.modifyBadgeCompletionBlock = { error in
                 if let error = error {
                     self.receivedError(error)

        let previousConfigure = configure
        configure = { [unowned self] _op in
            let op = previousConfigure?(_op) ?? _op
            op.subscriptionsToSave = self.operation.subscriptionsToSave
            op.subscriptionIDsToDelete = self.operation.subscriptionIDsToDelete
            op.modifySubscriptionsCompletionBlock = { saved, deleted, error in
                if let error = error {
                    self.receivedError(error)

        let previousConfigure = configure
        configure = { [unowned self] _op in
            let op = previousConfigure?(_op) ?? _op
            op.recordZonesToSave = self.recordZonesToSave
            op.recordZoneIDsToDelete = self.recordZoneIDsToDelete
            op.modifyRecordZonesCompletionBlock = { saved, deleted, error in
                if let error = error {
                    self.receivedError(error)
