diff --git a/nansat/exporter.py b/nansat/exporter.py
index 25c50a87..53884972 100644
--- a/nansat/exporter.py
+++ b/nansat/exporter.py
@@ -437,8 +437,8 @@ def _post_proc_thredds(self,
                 fill_value = None
                 if '_FillValue' in inp_var.ncattrs():
                     fill_value = inp_var._FillValue
-                if '_FillValue' in band_metadata[inp_var_name]:
-                    fill_value = band_metadata['_FillValue']
+                elif '_FillValue' in band_metadata[inp_var_name]:
+                    fill_value = band_metadata[inp_var_name]['_FillValue']
                 dimensions = ('time', ) + inp_var.dimensions
                 out_var = Exporter._copy_nc_var(inp_var, nc_out, inp_var_name, inp_var.dtype,
                         dimensions, fill_value=fill_value, zlib=zlib)
diff --git a/nansat/mappers/sentinel1.py b/nansat/mappers/sentinel1.py
index 57e7faba..90c1d11f 100644
--- a/nansat/mappers/sentinel1.py
+++ b/nansat/mappers/sentinel1.py
@@ -157,9 +157,13 @@ def test2(gcp_dim):
 
         logging.debug("GCPY size: %d" % gcp_y)
         logging.debug("GCPX size: %d" % gcp_x)
+        logging.debug("Pixel(s) size: %d" % pixel.size)
 
         if gcp_y*gcp_x != pixel.size:
-            raise ValueError("GCP dimension mismatch")
+            if gcp_y*gcp_x > pixel.size:
+                gcp_x, gcp_y = test1(gcp_x-1, gcp_y-1)
+            if gcp_y*gcp_x != pixel.size:
+                raise ValueError("GCP dimension mismatch")
 
         return int(gcp_y), int(gcp_x)