diff --git a/HEN_HOUSE/omega/beamnrc/beam_lib.mortran b/HEN_HOUSE/omega/beamnrc/beam_lib.mortran
index ced676429..40c64475c 100644
--- a/HEN_HOUSE/omega/beamnrc/beam_lib.mortran
+++ b/HEN_HOUSE/omega/beamnrc/beam_lib.mortran
@@ -66,6 +66,8 @@ REPLACE {$BEAM_PHSP_BUFFER_FLUSH;} WITH {;};
 
 REPLACE {$BEAM_READ_PHSP_FOR_RESTART;} WITH {;};
 
+REPLACE {$BEAM_CLOSE_PHSP;} WITH {;};
+
 REPLACE {$AVAILABLE_UNIT(#,#);} WITH {;
 {P1}=egs_get_unit({P1});
 IF ({P1}<1) [
diff --git a/HEN_HOUSE/omega/beamnrc/beamnrc.mortran b/HEN_HOUSE/omega/beamnrc/beamnrc.mortran
index b58767107..d95dfe68e 100644
--- a/HEN_HOUSE/omega/beamnrc/beamnrc.mortran
+++ b/HEN_HOUSE/omega/beamnrc/beamnrc.mortran
@@ -5345,17 +5345,8 @@ IF(IWATCH=4 | IZLAST=2 )[
     close(IOUTGEOM);
 ]
 IF(ISTORE = -1)[ CLOSE(IOUTRN); ]
-IF (IO_OPT =  0)|((IO_OPT =  3)&(IHSTRY <= 100000))|(IO_OPT=4) [
-      "phase-space output"
-  DO I=1,NSC_PLANES [
-     IF(IO_OPT=4)[
-        $IAEA_DESTROY_PHSP_FILE(IOUTFLU(I));
-     ]
-     ELSE[
-        CLOSE(IOUTFLU(I));
-     ]
-  ]
-]
+
+$BEAM_CLOSE_PHSP;
 
 CALL DATETIME(1);
 OUTPUT DATEN,TIMEN;(/' END OF RUN',10X,$DATEN_FORMAT,1X,$TIMEN_FORMAT//);
diff --git a/HEN_HOUSE/utils/phsp_macros.mortran b/HEN_HOUSE/utils/phsp_macros.mortran
index 314e3f420..c142064bc 100644
--- a/HEN_HOUSE/utils/phsp_macros.mortran
+++ b/HEN_HOUSE/utils/phsp_macros.mortran
@@ -1268,6 +1268,20 @@ REPLACE {$BEAM_READ_PHSP_FOR_RESTART;} WITH {;
     ]"end of loop over planes"
 };
 
+REPLACE {$BEAM_CLOSE_PHSP;} WITH {;
+IF (IO_OPT =  0)|((IO_OPT =  3)&(IHSTRY <= 100000))|(IO_OPT=4) [
+      "phase-space output"
+  DO I=1,NSC_PLANES [
+     IF(IO_OPT=4)[
+        $IAEA_DESTROY_PHSP_FILE(IOUTFLU(I));
+     ]
+     ELSE[
+        CLOSE(IOUTFLU(I));
+     ]
+  ]
+]
+};
+
 REPLACE {$DOSXYZ_OPEN_PHSP_FOR_WRITE;} WITH {;
     "Added by T. popescu and J.Lobo to write phsps in dosxyz."
     "only done for IAEAphsps."