diff --git a/src/output.F90 b/src/output.F90
index 316fe95941..1bf0c46d08 100644
--- a/src/output.F90
+++ b/src/output.F90
@@ -356,7 +356,7 @@ contains
     integer :: n  ! number of active generations
 
     ! Determine overall generation and number of active generations
-    i = overall_generation()
+    i = current_batch*gen_per_batch
     n = i - n_inactive*gen_per_batch
 
     ! write out information batch and option independent output
diff --git a/src/simulation.F90 b/src/simulation.F90
index 34c4336944..8fe4f025c3 100644
--- a/src/simulation.F90
+++ b/src/simulation.F90
@@ -294,8 +294,6 @@ contains
       if (master .and. verbosity >= 7) then
         if (current_gen /= gen_per_batch) then
           call print_generation()
-        else
-          call print_batch_keff()
         end if
       end if
 
@@ -338,6 +336,8 @@ contains
     if (run_mode == MODE_EIGENVALUE) then
       ! Perform CMFD calculation if on
       if (cmfd_on) call execute_cmfd()
+      ! Write batch output
+      if (master .and. verbosity >= 7) call print_batch_keff()
     end if
 
     ! Check_triggers