diff --git a/model/src/w3gridmd.F90 b/model/src/w3gridmd.F90
index 531dc4b64..aa618b59f 100644
--- a/model/src/w3gridmd.F90
+++ b/model/src/w3gridmd.F90
@@ -1161,7 +1161,6 @@ SUBROUTINE W3GRID()
     NDSI   = 10
     NDSS   = 99
     NDSM   = 20
-    NDSM   = 21
     !
     INQUIRE(FILE=TRIM(FNMPRE)//"ww3_grid.nml", EXIST=FLGNML)
     IF (FLGNML) THEN
diff --git a/model/src/w3iogomd.F90 b/model/src/w3iogomd.F90
index 8f8af9c5a..2ddfa77e0 100644
--- a/model/src/w3iogomd.F90
+++ b/model/src/w3iogomd.F90
@@ -3318,7 +3318,9 @@ SUBROUTINE W3IOGO ( INXOUT, NDSOG, IOTST, IMOD &
               !
             ELSE IF ( IFI .EQ. 5 .AND. IFJ .EQ. 1 ) THEN
               DO ISEA=1, NSEA
-                IF ( UST(ISEA) .NE. UNDEF .AND. ASF(ISEA) .NE. UNDEF ) THEN
+                IX     = MAPSF(ISEA,1)
+                IY     = MAPSF(ISEA,2)
+                IF ( MAPSTA(IY,IX) .EQ. 1 ) THEN
                   AUX1(ISEA) = UST(ISEA) * ASF(ISEA) *        &
                        COS(USTDIR(ISEA))
                   AUX2(ISEA) = UST(ISEA) * ASF(ISEA) *        &