diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def
index fd65d076b..0c80854e4 100644
--- a/definitions/grib2/section.4.def
+++ b/definitions/grib2/section.4.def
@@ -49,16 +49,16 @@ transient genVertHeightCoords = 0;
 if (defined(typeOfFirstFixedSurface)) {
    if (typeOfFirstFixedSurface == 150) {
       transient genVertHeightCoords = 1;
+      transient PVPresent = 0;
+      ieeefloat nlev  : dump ;
+      ieeefloat numberOfVGridUsed : dump;
+      byte[16] uuidOfVGrid : dump;
    }
 }
 
 if (genVertHeightCoords) {
    # Generalized vertical height coordinate case
-   transient PVPresent = 0;
-   ieeefloat nlev  : dump ;
    alias numberOfVerticalCoordinateValues = nlev ;
-   ieeefloat numberOfVGridUsed : dump;
-   byte[16] uuidOfVGrid : dump;
 }
 else {
    if (NV  == 0){
diff --git a/tests/filter.sh b/tests/filter.sh
index 44307fee2..cedee9174 100755
--- a/tests/filter.sh
+++ b/tests/filter.sh
@@ -58,5 +58,20 @@ EOF
 result=`${tools_dir}/grib_filter  ${data_dir}/formatint.rules  $GRIB_SAMPLES_PATH/GRIB1.tmpl`
 [ "$result" = "edition=001, level=  500" ]
 
+# Convert from grib1 to grib2 "Generalized vertical height coordinates"
+cat >temp.filt <<EOF
+set edition=2;
+set PVPresent=1;
+set NV=6;
+set typeOfFirstFixedSurface=150;
+set nlev=41.0;
+write;
+EOF
+
+${tools_dir}/grib_filter -o temp.grib2 temp.filt $GRIB_SAMPLES_PATH/GRIB1.tmpl
+result=`${tools_dir}/grib_get -p typeOfFirstFixedSurface,NV,nlev temp.grib2`
+[ "$result" = "150 6 41" ]
+
+rm -f temp.grib2 temp.filt
 rm -f ${data_dir}/formatint.rules
 
diff --git a/tests/local.sh b/tests/local.sh
index 3b3ff0150..12a34ff7d 100755
--- a/tests/local.sh
+++ b/tests/local.sh
@@ -70,7 +70,7 @@ do
 	${tools_dir}grib_set -s edition=2 loc1.grib1 loc1.grib2
 	${tools_dir}grib_get -p localDefinitionNumber loc1.grib1 >> local.log
 	${tools_dir}grib_get -p localDefinitionNumber loc1.grib2 >> local.log
-
+	
 	for localEps in 1 15 26 30
 	do
 		${tools_dir}grib_set -s localDefinitionNumber=$localEps,eps=1,perturbationNumber=2,numberOfForecastsInEnsemble=50 loc1.grib2 eps.grib2