diff --git a/src/save.c b/src/save.c
index 0c8f0880..d4a81667 100644
--- a/src/save.c
+++ b/src/save.c
@@ -398,13 +398,13 @@ static int read_dataset(FILE *fd, const char *type)
       n = sscanf(line, "No. Variables: %d", &nvars);
       dbg(dbglev, "read_dataset(): nvars=%d\n", nvars);
 
+      if(ac) nvars <<= 1;
       if(xctx->graph_datasets > 0  && xctx->graph_nvars != nvars && xctx->graph_sim_type) {
         dbg(0, "Xschem requires all datasets to be saved with identical and same number of variables\n");
         dbg(0, "There is a mismatch, so this and following datasets will not be read\n");
         return 1;
       }
 
-      if(ac) nvars <<= 1;
       if(n < 1) {
         dbg(0, "read_dataset(): WAARNING: malformed raw file, aborting\n");
         free_rawfile(0);
diff --git a/xschem_library/examples/test_ac.sch b/xschem_library/examples/test_ac.sch
index 26af47fb..13488df0 100644
--- a/xschem_library/examples/test_ac.sch
+++ b/xschem_library/examples/test_ac.sch
@@ -20,7 +20,7 @@ subdivx=8
 node="\\"diffout db20()\\""
 color=4
 
-unitx=M
+unitx=1
 divx=10
 
 logx=1
diff --git a/xschem_library/ngspice/comp_65nm.sym b/xschem_library/ngspice/comp_65nm.sym
index 96d49354..13268d25 100644
--- a/xschem_library/ngspice/comp_65nm.sym
+++ b/xschem_library/ngspice/comp_65nm.sym
@@ -1,9 +1,11 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.1.0 file_version=1.2
+}
 G {}
 K {type=subcircuit
 format="@name @pinlist @symname"
 template="name=x1"
-}
+xschematic="tcleval([ hier_conf @symname ])"
+schematic=@symname}
 V {}
 S {}
 E {}