diff --git a/tools/jfjoch_process.cpp b/tools/jfjoch_process.cpp
index 26e82518..b1585eec 100644
--- a/tools/jfjoch_process.cpp
+++ b/tools/jfjoch_process.cpp
@@ -44,6 +44,7 @@ int main(int argc, char **argv) {
     int start_image = 0;
     int end_image = -1; // -1 indicates process until end
     bool verbose = false;
+    bool rotation_index = false;
 
     if (argc == 1) {
         print_usage(logger);
@@ -51,7 +52,7 @@ int main(int argc, char **argv) {
     }
 
     int opt;
-    while ((opt = getopt(argc, argv, "o:N:s:e:v")) != -1) {
+    while ((opt = getopt(argc, argv, "o:N:s:e:vR")) != -1) {
         switch (opt) {
             case 'o':
                 output_prefix = optarg;
@@ -68,6 +69,9 @@ int main(int argc, char **argv) {
             case 'v':
                 verbose = true;
                 break;
+            case 'R':
+                rotation_index = true;
+                break;
             default:
                 print_usage(logger);
                 exit(EXIT_FAILURE);
@@ -110,7 +114,7 @@ int main(int argc, char **argv) {
     // Configure Indexing
     IndexingSettings indexing_settings;
     indexing_settings.Algorithm(IndexingAlgorithmEnum::FFT);
-    indexing_settings.RotationIndexing(true);
+    indexing_settings.RotationIndexing(rotation_index);
     indexing_settings.GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum::BeamCenter);
     experiment.ImportIndexingSettings(indexing_settings);
 
@@ -207,7 +211,15 @@ int main(int argc, char **argv) {
 
             if (!img) continue;
 
-            DataMessage msg = img->ImageData();
+            DataMessage msg;
+
+            msg.image = img->ImageData().image;
+            msg.number = img->ImageData().number;
+            msg.error_pixel_count = img->ImageData().error_pixel_count;
+            msg.image_collection_efficiency = img->ImageData().image_collection_efficiency;
+            msg.storage_cell = img->ImageData().storage_cell;
+            msg.user_data = img->ImageData().user_data;
+
             total_uncompressed_bytes += msg.image.GetUncompressedSize();
 
             auto image_start_time = std::chrono::high_resolution_clock::now();