diff --git a/packages/seacas/applications/exodiff/create_file.C b/packages/seacas/applications/exodiff/create_file.C
index c23fc192c1..3b8e5d2261 100644
--- a/packages/seacas/applications/exodiff/create_file.C
+++ b/packages/seacas/applications/exodiff/create_file.C
@@ -323,6 +323,11 @@ namespace {
     }
 
     if (do_all_flag) {
+      // See if the names in `names` are from a previous change set iteration...
+      if (!names.empty() && x_list.empty()) {
+	names.clear();
+	tols.clear();
+      }
       auto length_name = var_names1.size();
       for (size_t n = 0; n < length_name; ++n) {
         const std::string &name = var_names1[n];
diff --git a/packages/seacas/applications/exodiff/exodiff.C b/packages/seacas/applications/exodiff/exodiff.C
index 8e938a84d6..6adc0c90cd 100644
--- a/packages/seacas/applications/exodiff/exodiff.C
+++ b/packages/seacas/applications/exodiff/exodiff.C
@@ -321,8 +321,8 @@ namespace {
         }
       }
       for (int i = 0; i < cs_cnt; i++) {
-        cs1.push_back(i);
-        cs2.push_back(i);
+        cs1.push_back(i+1);
+        cs2.push_back(i+1);
       }
       return std::make_pair(cs1, cs2);
     }