diff --git a/HEN_HOUSE/user_codes/dosxyznrc/srcxyznrc.mortran b/HEN_HOUSE/user_codes/dosxyznrc/srcxyznrc.mortran
index 402bf988d..24e335baf 100644
--- a/HEN_HOUSE/user_codes/dosxyznrc/srcxyznrc.mortran
+++ b/HEN_HOUSE/user_codes/dosxyznrc/srcxyznrc.mortran
@@ -2397,8 +2397,6 @@ $REAL weight,
       cosphi,sinphi;
 $INTEGER i;
 
-$INIT_PHSP_COUNTERS;
-
 OUTPUT61;(' ');
 
 "------------------------------------------------------------------------"
diff --git a/HEN_HOUSE/utils/iaea_phsp_macros.mortran b/HEN_HOUSE/utils/iaea_phsp_macros.mortran
index 957a22896..e94b78611 100644
--- a/HEN_HOUSE/utils/iaea_phsp_macros.mortran
+++ b/HEN_HOUSE/utils/iaea_phsp_macros.mortran
@@ -253,7 +253,7 @@ ELSE[
 "we assume this is the first float after zlast, if zlast is scored,"
 "and has generic user type = 0"
 iaea_i_muidx=MAX(1,iaea_i_zlast+1);
-IF(iaea_n_extra_floats=0 | iaea_extra_float_types(iaea_i_muidx)~=0) [
+IF(iaea_i_muidx>iaea_n_extra_floats | iaea_extra_float_types(iaea_i_muidx)~=0) [
   iaea_i_muidx=-99;"reset this to no scoring"
   {P8}=0;
 ]