diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index 10a2d641a5f7c46baa1fac2903840cc395167bfc..5411367e3dcb360e8d2c7ca449699f04fd0b1e5e 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -1767,7 +1767,8 @@ void cdf_set_dimtype(int nvars, ncvar_t *ncvars, ncdim_t *ncdims)
                         cdf_set_dim(ncvar, i, X_AXIS);
                         lxdim = true;
                       }
-                    else if ( !lydim && ncvar->gridtype != GRID_UNSTRUCTURED )
+                    else if ( !lydim && ! (ncvars[ncvar->xvarid].dimids[0] ==
+ncvars[ncvar->yvarid].dimids[0] && ncvars[ncvar->xvarid].ndims == 1 && ncvars[ncvar->yvarid].ndims == 1))
                       {
                         if ( lcdim && ncvar->yvarid == CDI_UNDEFID )
                           {