diff --git a/examples/main.c b/examples/main.c
index 10ae2e904c6033dd327a815e3adbebf79c8ef355..fe95b549a1650ef83eb9a8390554f7ca01022b09 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -932,7 +932,7 @@ int main(int argc, char *argv[]) {
     engine_print_stats(&e);
   
     /* Call VELOCIraptor for the first time after the first snapshot dump. */
-    if (e.policy & engine_policy_structure_finding) velociraptor_invoke(&e);
+    //if (e.policy & engine_policy_structure_finding) velociraptor_invoke(&e);
 
   }
 
@@ -1125,6 +1125,12 @@ int main(int argc, char *argv[]) {
   engine_print_stats(&e);
   engine_dump_snapshot(&e);
 
+  /* Call VELOCIraptor at the end of the run to find groups. */
+  if (e.policy & engine_policy_structure_finding) {
+    velociraptor_init(&e);
+    velociraptor_invoke(&e);
+  }
+
 #ifdef WITH_MPI
   if ((res = MPI_Finalize()) != MPI_SUCCESS)
     error("call to MPI_Finalize failed with error %i.", res);
diff --git a/src/engine.c b/src/engine.c
index f2c268b6414899eb95c813a1c955617ccf03bc10..ef7c14c70e797878a36b9a1cf7e9a232cf36c752 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4650,7 +4650,7 @@ void engine_step(struct engine *e) {
 
   /* Perform structure finding? */
   if (e->run_stf) {
-    velociraptor_invoke(e);
+    //velociraptor_invoke(e);
     
     /* ... and find the next output time */
     if(e->stf_output_freq_format == IO_STF_OUTPUT_FREQ_FORMAT_TIME) engine_compute_next_stf_time(e);
@@ -5560,7 +5560,7 @@ void engine_config(int restart, struct engine *e, struct swift_params *params,
     parser_get_param_string(params, "StructureFinding:basename", e->stfBaseName);
     e->timeFirstSTFOutput = parser_get_param_double(params, "StructureFinding:time_first");
     e->a_first_stf = parser_get_opt_param_double(params, "StructureFinding:a_time_first", 0.1);
-    velociraptor_init(e);
+    //velociraptor_init(e);
     e->stf_output_freq_format = parser_get_param_int(params, "StructureFinding:output_time_format");
     if(e->stf_output_freq_format == IO_STF_OUTPUT_FREQ_FORMAT_STEPS) {
       e->deltaTimeSTF = (double)parser_get_param_int(params, "StructureFinding:delta_time");