diff --git a/examples/EAGLE_6/eagle_6.yml b/examples/EAGLE_6/eagle_6.yml
index 093f82ada721a0ae2854acce8ebc7719ed4c792b..65d9c094ac635febb2b0cf21529231155b270a33 100644
--- a/examples/EAGLE_6/eagle_6.yml
+++ b/examples/EAGLE_6/eagle_6.yml
@@ -43,7 +43,7 @@ TimeIntegration:
 # Parameters governing the snapshots
 Snapshots:
   basename:            eagle # Common part of the name of output files
-  time_first:          1.    # Time of the first output (in internal units)
+  time_first:          0.    # Time of the first output (in internal units)
   delta_time:          1e-3  # Time difference between consecutive outputs (in internal units)
   compression:         4
 
diff --git a/src/engine.c b/src/engine.c
index e9660d6e20fa27c4999dcdb09053bb6782003460..b974447277cc6eaced3b99a2eb20a4466ea9cdee 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4534,7 +4534,7 @@ void engine_step(struct engine *e) {
     velociraptor_invoke(e);
     
     /* ... and find the next output time */
-    engine_compute_next_stf_time(e);
+    if(e->stf_output_time_format == 1) engine_compute_next_stf_time(e);
     
     e->run_stf = 0;
   }
@@ -5642,8 +5642,10 @@ void engine_config(int restart, struct engine *e,
         e->timeFirstSnapshot, e->time_begin);
 
   /* Find the time of the first stf output */
-  engine_compute_next_stf_time(e);
-  message("Next STF step will be: %lld", e->ti_nextSTF);
+  if(e->stf_output_time_format == 1) { 
+    engine_compute_next_stf_time(e);
+    message("Next STF step will be: %lld", e->ti_nextSTF);
+  }
 
   /* Find the time of the first output */
   engine_compute_next_snapshot_time(e);