diff --git a/xschem_library/devices/ammeter.sym b/xschem_library/devices/ammeter.sym
index ac6e28f9..6458dc84 100644
--- a/xschem_library/devices/ammeter.sym
+++ b/xschem_library/devices/ammeter.sym
@@ -16,5 +16,5 @@ B 5 -2.5 27.5 2.5 32.5 {name=minus dir=inout propag=0}
 T {@name} 15 -18.75 0 0 0.2 0.2 {}
 T {@#0:net_name} 10 -28.75 0 0 0.15 0.15 {layer=15}
 T {@#1:net_name} 10 20 0 0 0.15 0.15 {layer=15}
-T {tcleval(id=[ngspice::get_node [subst -nocommand \{i($\{path\}@name\\\\)\}]] )} 12.5 0 0 0 0.2 0.2 {layer=15
+T {tcleval(i=[ngspice::get_current @name\\])} 12.5 0 0 0 0.2 0.2 {layer=15
 hide=true}
diff --git a/xschem_library/devices/vsource.sym b/xschem_library/devices/vsource.sym
index d472c7ac..8a860f68 100644
--- a/xschem_library/devices/vsource.sym
+++ b/xschem_library/devices/vsource.sym
@@ -2,7 +2,8 @@ v {xschem version=3.1.0 file_version=1.2
 }
 G {}
 K {type=vsource
-format="@name @pinlist @value"
+format="@name @pinlist @value
+.save I( ?1 @name )"
 template="name=V1 value=3"}
 V {}
 S {}
@@ -14,8 +15,8 @@ B 5 -2.5 -32.5 2.5 -27.5 {name=p dir=inout}
 B 5 -2.5 27.5 2.5 32.5 {name=m dir=inout}
 A 4 0 0 15 270 360 {}
 T {@name} 20 -18.75 0 0 0.2 0.2 {}
-T {@value} 20 -6.25 0 0 0.2 0.2 {}
+T {@value} 20 6.25 0 0 0.2 0.2 {}
 T {@#0:net_name} 10 -28.75 0 0 0.15 0.15 {layer=15}
 T {@#1:net_name} 10 20 0 0 0.15 0.15 {layer=15}
-T {tcleval(id=[ngspice::get_node [subst -nocommand \{i($\{path\}@name\\\\)\}]] )} 17.5 7.5 0 0 0.2 0.2 {layer=15
+T {tcleval(i=[ngspice::get_current @name\\])} 20 -6.25 0 0 0.2 0.2 {layer=15
 hide=true}