 		let op = CKFetchRecordZoneChangesOperation(recordZoneIDs: [Self.zoneID], configurationsByRecordZoneID: [Self.zoneID: zoneConfig])
         op.fetchAllChanges = true
 
-        op.recordZoneChangeTokensUpdatedBlock = { [weak self] zoneID, token, _ in
-            guard let self = self else { return }
-			
-			DispatchQueue.main.async {
-				self.changeToken = token
-			}
+        op.recordZoneChangeTokensUpdatedBlock = { zoneID, token, _ in
+			savedChangeToken = token
         }
 
         op.recordChangedBlock = { record in

			switch CloudKitZoneResult.resolve(error) {
			case .success:
				DispatchQueue.main.async {
					self.delegate?.cloudKitDidModify(changed: changedRecords, deleted: deletedRecordKeys, completion: completion)
				}
			case .zoneNotFound:
				self.createZoneRecord() { result in

	/// Fetch all the changes in the CKZone since the last time we checked
    func fetchChangesInZone(completion: @escaping (Result<Void, Error>) -> Void) {

		var savedChangeToken = changeToken
		
		var changedRecords = [CKRecord]()
		var deletedRecordKeys = [CloudKitRecordKey]()
		
