diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py b/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
index 63860dd30b..417a11d258 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
@@ -810,6 +810,10 @@ class GribDecoder():
                 dx = self._divideBy10e6(gdsTemplate[16])
                 dy = self._divideBy10e6(gdsTemplate[17])
 
+            if dx == 65.535:
+                dx = abs(lo1-lo2)/nx
+            if dy == 65.535:
+                dy = abs(la1-la2)/ny
             coverage.setSpacingUnit(DEFAULT_SPACING_UNIT2)
             coverage.setNx(Integer(nx))
             coverage.setNy(Integer(ny))
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
index 9f0aecfb6d..ef78307138 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
@@ -951,7 +951,7 @@
 		<name>GlobalWave</name>
 		<center>7</center>
 		<subcenter>0</subcenter>
-		<grid>011</grid>
+		<grid>11</grid>
 		<process>
 			<id>11</id>
 		</process>