diff --git a/model/src/w3wavemd.F90 b/model/src/w3wavemd.F90
index 44c80964d..c144ab8d8 100644
--- a/model/src/w3wavemd.F90
+++ b/model/src/w3wavemd.F90
@@ -2409,8 +2409,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
 #endif
         !
 #ifdef W3_MPI
-        IF ( ( (DSEC21(TIME,TONEXT(:,1)).EQ.0.) .AND. FLOUT(1) ) .OR. &
-             (  (DSEC21(TIME,TONEXT(:,7)).EQ.0.) .AND. FLOUT(7) .AND. SBSED ) ) THEN
+        IF ( (FLOUTG) .OR. (FLOUTG2 .AND. SBSED) ) THEN
           IF (.NOT. LPDLIB) THEN
             IF (NRQGO.NE.0 ) THEN
 #endif