diff --git a/deltaScripts/unified_grid/convert_grib_data.py b/deltaScripts/unified_grid/convert_grib_data.py
index e08904d996..8f0df9e9a7 100644
--- a/deltaScripts/unified_grid/convert_grib_data.py
+++ b/deltaScripts/unified_grid/convert_grib_data.py
@@ -97,8 +97,6 @@ def convertModel(modelName):
             secondaryId = "Version" + version
         ensembleId = convertPert(pert)
         newdatauri = "/grid/" + datatime + "/" + modelName + "/" + secondaryId + "/" + ensembleId + "/" + gridcoverageid + "/" + paramabbrev + "/" + masterlevel + "/" + levelone + "/" + leveltwo
-        if paramabbrev.startswith("static") and gribforecasttime != 0:
-            continue
         hdfTime -= time()
         try:
             forecast = int(gribforecasttime)/3600
@@ -106,26 +104,26 @@ def convertModel(modelName):
             newgrp = newdatauri
             dataset="Data"
             if paramabbrev.startswith("static"):
-                forecast = 0
                 prevgrp = "/"
-                newgrp = "/" + gridcoveragename
+                newgrp = "/" + gridcoverageid
                 dataset=paramabbrev
             filebase = "/%s-%s-FH-%.3d.h5" % (modelName, gribreftime.split(":")[0].replace(" ", "-"), forecast)
             hdf5file = gridFiles + masterlevel + filebase
-            if lastFile != None and lastFile.filename != hdf5file:
-                #print "Closing", lastFile.filename
-                lastFile.close()
-                lastFile = None
-            if lastFile == None:
-                if not(exists(hdf5file)):
-                    t0 = time()
-                    if not(isdir(gridFiles + masterlevel)):
-                        mkdir(gridFiles + masterlevel)
-                    move(gribFiles + masterlevel + filebase, gridFiles + masterlevel)
-                    hdfTime -= (time() - t0)
-                #print "Opening", hdf5file
-                lastFile = h5py.File(hdf5file)
-            copyH5(lastFile, prevgrp, newgrp, dataset)
+            if not(paramabbrev.startswith("static")) or forecast == 0:
+                if lastFile != None and lastFile.filename != hdf5file:
+                    #print "Closing", lastFile.filename
+                    lastFile.close()
+                    lastFile = None
+                if lastFile == None:
+                    if not(exists(hdf5file)):
+                        t0 = time()
+                        if not(isdir(gridFiles + masterlevel)):
+                            mkdir(gridFiles + masterlevel)
+                        move(gribFiles + masterlevel + filebase, gridFiles + masterlevel)
+                        hdfTime -= (time() - t0)
+                    #print "Opening", hdf5file
+                    lastFile = h5py.File(hdf5file)
+                copyH5(lastFile, prevgrp, newgrp, dataset)
         except:
             print modelName, "Error", gribdatauri
             print sys.exc_info()[1]
diff --git a/deltaScripts/unified_grid_rollback/convert_grib_data.py b/deltaScripts/unified_grid_rollback/convert_grib_data.py
index 7e75116b1b..afb14740d9 100644
--- a/deltaScripts/unified_grid_rollback/convert_grib_data.py
+++ b/deltaScripts/unified_grid_rollback/convert_grib_data.py
@@ -87,8 +87,6 @@ def convertModel(modelName):
             secondaryId = "Version" + version
         ensembleId = convertPert(pert)
         newdatauri = "/grid/" + datatime + "/" + modelName + "/" + secondaryId + "/" + ensembleId + "/" + gridcoverageid + "/" + paramabbrev + "/" + masterlevel + "/" + levelone + "/" + leveltwo
-        if paramabbrev.startswith("static") and gribforecasttime != 0:
-            continue
         hdfTime -= time()
         try:
             forecast = int(gribforecasttime)/3600
@@ -96,26 +94,26 @@ def convertModel(modelName):
             newgrp = newdatauri
             dataset="Data"
             if paramabbrev.startswith("static"):
-                forecast = 0
-                prevgrp = "/"
-                newgrp = "/" + gridcoveragename
+                prevgrp = "/"+ gridcoverageid
+                newgrp = "/" 
                 dataset=paramabbrev
-            filebase = "/%s-%s-FH-%.3d.h5" % (modelName, gribreftime.split(":")[0].replace(" ", "-"), forecast)
-            hdf5file = gribFiles + masterlevel + filebase
-            if lastFile != None and lastFile.filename != hdf5file:
-                #print "Closing", lastFile.filename
-                lastFile.close()
-                lastFile = None
-            if lastFile == None:
-                if not(exists(hdf5file)):
-                    t0 = time()
-                    if not(isdir(gribFiles + masterlevel)):
-                        mkdir(gribFiles + masterlevel)
-                    move(gridFiles + masterlevel + filebase, gribFiles)
-                    hdfTime -= (time() - t0)
-                #print "Opening", hdf5file
-                lastFile = h5py.File(hdf5file)
-            copyH5(lastFile, newgrp, prevgrp, dataset)
+            if not(paramabbrev.startswith("static")) or forecast == 0:
+                filebase = "/%s-%s-FH-%.3d.h5" % (modelName, gribreftime.split(":")[0].replace(" ", "-"), forecast)
+                hdf5file = gribFiles + masterlevel + filebase
+                if lastFile != None and lastFile.filename != hdf5file:
+                    #print "Closing", lastFile.filename
+                    lastFile.close()
+                    lastFile = None
+                if lastFile == None:
+                    if not(exists(hdf5file)):
+                        t0 = time()
+                        if not(isdir(gribFiles + masterlevel)):
+                            mkdir(gribFiles + masterlevel)
+                        move(gridFiles + masterlevel + filebase, gribFiles + masterlevel)
+                        hdfTime -= (time() - t0)
+                    #print "Opening", hdf5file
+                    lastFile = h5py.File(hdf5file)
+                copyH5(lastFile, newgrp, prevgrp, dataset)
         except:
             print modelName, "Error", gribdatauri
             print sys.exc_info()[1]