diff --git a/examples/sim_fibo_ad.cpp b/examples/sim_fibo_ad.cpp
index 76777d784..a13d2d29f 100644
--- a/examples/sim_fibo_ad.cpp
+++ b/examples/sim_fibo_ad.cpp
@@ -230,8 +230,10 @@ try
 
         simtimer.setCurrentStepNum(reportStepIdx);
 
-        if (reportStepIdx == 0)
+        if (reportStepIdx == 0) {
             outputWriter.writeInit(simtimer, state, well_state.basicWellState());
+            outputWriter.writeTimeStep(simtimer, state, well_state.basicWellState());
+        }
 
         // Create and run simulator.
         SimulatorFullyImplicitBlackoil simulator(param,
@@ -243,6 +245,8 @@ try
                                                  grav);
         SimulatorReport episodeReport = simulator.run(simtimer, state, well_state);
 
+        ++simtimer;
+
         outputWriter.writeTimeStep(simtimer, state, well_state.basicWellState());
         fullReport += episodeReport;
     }
diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoil.cpp b/opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
index 9d9b022e5..a36ae887e 100644
--- a/opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
@@ -411,7 +411,7 @@ namespace Opm
             }
 
             // advance to next timestep before reporting at this location
-            ++timer;
+            // ++timer; // Commented out since this has temporarily moved to the main() function.
             break; // this is a temporary measure
         }