diff --git a/image_analysis/IndexAndRefine.cpp b/image_analysis/IndexAndRefine.cpp
index d52d90df..4bf9cfa9 100644
--- a/image_analysis/IndexAndRefine.cpp
+++ b/image_analysis/IndexAndRefine.cpp
@@ -125,7 +125,7 @@ void IndexAndRefine::ProcessImage(DataMessage &msg,
     }
 
     if (lattice_candidate) {
-        if (AnalyzeIndexing(msg, experiment, *lattice_candidate)) {
+        if (AnalyzeIndexing(msg, experiment_copy, *lattice_candidate)) {
             msg.lattice_type = symmetry;
 
             float ewald_dist_cutoff = 0.001f;
diff --git a/image_analysis/RotationIndexer.cpp b/image_analysis/RotationIndexer.cpp
index b654ade7..74d573ab 100644
--- a/image_analysis/RotationIndexer.cpp
+++ b/image_analysis/RotationIndexer.cpp
@@ -26,8 +26,8 @@ RotationIndexer::RotationIndexer(const DiffractionExperiment &x, IndexerThreadPo
                 image_stride = 1;
             } else {
                 first_image_to_try_indexing = std::max<int64_t>(min_images_for_indexing,
-                    min_accum_angle_deg / angle_norm_deg);
-                image_stride = std::ceil(stride_angle_deg / angle_norm_deg);
+                    x.GetIndexingSettings().GetRotationIndexingMinAngularRange_deg() / angle_norm_deg);
+                image_stride = std::ceil(x.GetIndexingSettings().GetRotationIndexingAngularStride_deg() / angle_norm_deg);
                 if (image_stride == 0)
                     image_stride = 1;
             }
@@ -151,7 +151,6 @@ std::optional<RotationIndexerResult> RotationIndexer::ProcessImage(int64_t image
     return {};
 }
 
-
 std::optional<RotationIndexerResult> RotationIndexer::Finalize(bool retry) {
     if (!indexed_lattice || retry)
         TryIndex();
diff --git a/image_analysis/RotationIndexer.h b/image_analysis/RotationIndexer.h
index 75bf3575..3cf4cb6a 100644
--- a/image_analysis/RotationIndexer.h
+++ b/image_analysis/RotationIndexer.h
@@ -29,8 +29,6 @@ class RotationIndexer {
     const DiffractionExperiment& experiment;
 
     constexpr static int64_t max_spots = 60000;
-    constexpr static float min_accum_angle_deg = 20.0;
-    constexpr static float stride_angle_deg = 0.5;
     constexpr static int64_t min_images_for_indexing = 10;
 
     const bool index_ice_rings;