diff --git a/openmc/mgxs/mdgxs.py b/openmc/mgxs/mdgxs.py
index 0a2f898c07..5e5d840b6c 100644
--- a/openmc/mgxs/mdgxs.py
+++ b/openmc/mgxs/mdgxs.py
@@ -793,7 +793,8 @@ class MDGXS(MGXS):
 
             df.rename(columns={'energyout low [MeV]': 'group out'},
                       inplace=True)
-            out_groups = np.tile(all_groups, int(df.shape[0] / all_groups.size))
+            out_groups = np.repeat(all_groups, self.xs_tally.num_scores)
+            out_groups = np.tile(out_groups, int(df.shape[0] / out_groups.size))
             df['group out'] = out_groups
             del df['energyout high [MeV]']
             columns = ['group in', 'group out']
diff --git a/src/source.F90 b/src/source.F90
index fad9ae46af..452d8ddfce 100644
--- a/src/source.F90
+++ b/src/source.F90
@@ -107,7 +107,7 @@ contains
     real(8) :: r(3)       ! sampled coordinates
     logical :: found      ! Does the source particle exist within geometry?
     type(Particle) :: p   ! Temporary particle for using find_cell
-    integer, save :: n_sample = 0  ! Number of samples
+    integer, save :: n_accept = 0  ! Number of samples accepted
     integer, save :: n_reject = 0  ! Number of samples rejected
 
     ! Set weight to one by default
@@ -161,15 +161,15 @@ contains
       if (.not. found) then
         n_reject = n_reject + 1
         if (n_reject >= EXTSRC_REJECT_THRESHOLD .and. &
-             real(n_sample, 8)/n_reject <= EXTSRC_REJECT_FRACTION) then
+             real(n_accept, 8)/n_reject <= EXTSRC_REJECT_FRACTION) then
           call fatal_error("More than 95% of external source sites sampled &
                &were rejected. Please check your external source definition.")
         end if
       end if
     end do
 
-    ! Increment number of samples
-    n_sample = n_sample + 1
+    ! Increment number of accepted samples
+    n_accept = n_accept + 1
 
     call p % clear()