diff --git a/src/save.c b/src/save.c
index 20547c51..47690b29 100644
--- a/src/save.c
+++ b/src/save.c
@@ -804,6 +804,7 @@ int raw_read(const char *f, Raw **rawptr, const char *type)
   if(fd) {
     if((res = read_dataset(fd, rawptr, type)) == 1) {
       int i;
+      set_modify(-2); /* clear text floater caches */
       my_strdup2(_ALLOC_ID_, &raw->rawfile, f);
       my_strdup2(_ALLOC_ID_, &raw->schname, xctx->sch[xctx->currsch]);
       raw->level = xctx->currsch;
diff --git a/tests/xschemtest.tcl b/tests/xschemtest.tcl
index 4e67091d..5cdbedf8 100644
--- a/tests/xschemtest.tcl
+++ b/tests/xschemtest.tcl
@@ -197,7 +197,7 @@ proc netlist_test {} {
     inst_sch_select.sch     spice       801962545
     test_bus_tap.sch        spice       181420586
     loading.sch             vhdl       2975204502
-    mos_power_ampli.sch     spice      1986885043
+    mos_power_ampli.sch     spice      2027301758
     hierarchical_tedax.sch  tedax       998070173
     LCC_instances.sch       spice       696885230
     pcb_test1.sch           tedax      1925087189
diff --git a/xschem_library/examples/mos_power_ampli.sch b/xschem_library/examples/mos_power_ampli.sch
index a3a9c29b..425f2a43 100644
--- a/xschem_library/examples/mos_power_ampli.sch
+++ b/xschem_library/examples/mos_power_ampli.sch
@@ -137,11 +137,11 @@ N 690 -1210 690 -970 {lab=VBOOST}
 N 690 -910 690 -900 {lab=B1}
 N 260 -550 260 -540 {lab=E9}
 N 150 -180 260 -180 {lab=VSS}
-N 50 -300 220 -300 {lab=B3}
+N 40 -300 220 -300 {lab=B3}
 N 260 -270 260 -240 {lab=E3}
 N 150 -240 150 -180 {lab=VSS}
-N 50 -240 50 -180 {lab=VSS}
-N 50 -180 150 -180 {lab=VSS}
+N 40 -210 40 -180 {lab=VSS}
+N 40 -180 150 -180 {lab=VSS}
 N 690 -690 1110 -690 {lab=OUTI}
 N 180 -550 260 -550 {lab=E9}
 N 1110 -700 1110 -690 {lab=OUTI}
@@ -153,7 +153,6 @@ N 1110 -820 1110 -790 {lab=SA}
 N 860 -850 1070 -850 {lab=GA}
 N 340 -830 340 -780 {lab=C2}
 N 340 -720 340 -650 {lab=C9}
-N 220 -720 340 -720 {lab=C9}
 N 180 -690 180 -650 {lab=C5}
 N 1330 -680 1390 -680 {lab=OUT}
 N 1110 -680 1240 -680 {lab=OUTI}
@@ -184,7 +183,7 @@ N 340 -1270 560 -1270 {lab=VPP}
 N 1110 -1270 1110 -880 { lab=VPP}
 N 560 -1270 1110 -1270 {lab=VPP}
 N 230 -1040 800 -1040 { lab=#net2}
-N 0 -180 50 -180 {
+N 0 -180 40 -180 {
 lab=VSS}
 N 0 -140 1110 -140 {
 lab=VNN}
@@ -197,6 +196,14 @@ N 400 -620 400 -570 {
 lab=MINUS}
 N 380 -620 400 -620 {
 lab=MINUS}
+N 300 -720 340 -720 {
+lab=C9}
+N 220 -720 240 -720 {
+lab=#net8}
+N 40 -300 40 -270 {
+lab=B3}
+N 150 -400 150 -360 {
+lab=VPP}
 C {ipin.sym} 0 -620 0 0 {name=p0 lab=PLUS}
 C {ipin.sym} 0 -140 0 0 {name=p3 lab=VNN}
 C {nmos3.sym} 1090 -530 0 0 {name=xm2 model=irf540 m=1
@@ -287,9 +294,9 @@ url="http://www.futurlec.com/Datasheet/Diodes/1N746-1N759.pdf"
  net_name=true}
 C {npn.sym} 240 -300 0 0 {name=Q3 model=q2n2222 area=1 net_name=true}
 C {res.sym} 150 -330 0 1 {name=R1 m=1 value=10k net_name=true}
-C {lab_pin.sym} 150 -360 0 0 {name=p7 lab=VPP}
+C {lab_pin.sym} 150 -400 0 0 {name=p7 lab=VPP}
 C {res.sym} 260 -210 0 1 {name=R10 m=1 value=170 net_name=true}
-C {capa.sym} 50 -270 0 0 {name=C3 m=1 value=100n net_name=true}
+C {capa.sym} 40 -240 0 0 {name=C3 m=1 value=100n net_name=true}
 C {res.sym} 560 -700 0 1 {name=R12 m=1 value=1300 net_name=true}
 C {lab_pin.sym} 690 -890 0 0 {name=p12 lab=B1}
 C {lab_pin.sym} 340 -550 0 1 {name=p13 lab=E9}
@@ -298,7 +305,7 @@ C {lab_pin.sym} 560 -650 0 1 {name=p20 lab=E8}
 C {lab_pin.sym} 840 -940 0 0 {name=p21 lab=E11}
 C {lab_pin.sym} 260 -260 0 1 {name=p22 lab=E3}
 C {lab_pin.sym} 260 -350 0 0 {name=p26 lab=C3}
-C {lab_pin.sym} 50 -300 0 0 {name=p30 lab=B3}
+C {lab_pin.sym} 40 -300 0 0 {name=p30 lab=B3}
 C {lab_pin.sym} 520 -580 0 0 {name=p33 lab=VSS}
 C {res.sym} 340 -750 0 1 {name=R13 m=1 value=300 net_name=true}
 C {npn.sym} 200 -720 0 1 {name=Q7 model=q2n2222 area=1 net_name=true}
@@ -465,3 +472,4 @@ C {ngspice_get_expr.sym} 1130 -860 0 0 {name=r22
 node="[ngspice::get_current \{xm1.rd[i]\}]" 
 descr = current
 }
+C {ammeter.sym} 270 -720 1 0 {name=v9  net_name=true }
diff --git a/xschem_library/examples/poweramp.sch b/xschem_library/examples/poweramp.sch
index 4ad3b99c..b0a7e478 100644
--- a/xschem_library/examples/poweramp.sch
+++ b/xschem_library/examples/poweramp.sch
@@ -38,8 +38,8 @@ B 2 1200 -500 1880 -310 {flags=graph
 y1 = -0.0059
 y2 = 11
 divy = 6
-x1=0.00562909
-x2=0.0165959
+x1=0.0228839
+x2=0.0242439
 divx=10
 node="i(v.x1.vu)
 i(v.x0.vu)
@@ -52,8 +52,8 @@ B 2 1200 -830 1880 -520 {flags=graph
 y1 = -49
 y2 = 58
 divy = 12
-x1=0.00562909
-x2=0.0165959
+x1=0.0228839
+x2=0.0242439
 divx=10
 node="outp
 outm
@@ -68,8 +68,8 @@ B 2 1200 -1020 1880 -830 {flags=graph
 y1 = 0
 y2 = 830
 divy = 6
-x1=0.00562909
-x2=0.0165959
+x1=0.0228839
+x2=0.0242439
 divx=10
 
 
@@ -82,8 +82,8 @@ B 2 1200 -310 1880 -120 {flags=graph
 y1 = 0
 y2 = 840
 divy = 6
-x1=0.00562909
-x2=0.0165959
+x1=0.0228839
+x2=0.0242439
 divx=10
 
 
@@ -185,8 +185,8 @@ N 240 -320 240 -220 { lab=INX}
 N 160 -1220 180 -1220 {lab=#net3}
 N 160 -1060 180 -1060 {lab=#net4}
 N 70 -1140 180 -1140 {lab=#net5}
-C {vsource.sym} 70 -1170 0 0 {name=V1 value="dc 50 pwl 0 0 1m 50"}
-C {vsource.sym} 70 -1110 0 0 {name=V0 value="dc 50 pwl 0 0 1m 50"}
+C {vsource.sym} 70 -1170 0 0 {name=V1 value="dc \{VPP\} pwl 0 0 1m \{VPP\}"}
+C {vsource.sym} 70 -1110 0 0 {name=V0 value="dc \{VPP\} pwl 0 0 1m \{VPP\}"}
 C {lab_pin.sym} 310 -1220 0 1 {name=p5 lab=VPP}
 C {lab_pin.sym} 310 -1060 0 1 {name=p6 lab=VNN}
 C {lab_pin.sym} 310 -1140 0 1 {name=p3 lab=VSS}
@@ -230,7 +230,7 @@ C {res.sym} 550 -460 0 1 {name=R2 m=1 value='100k'}
 C {res.sym} 550 -400 0 1 {name=R3 m=1 value="'100k/(gain-2)'"}
 C {vsource.sym} 870 -1140 0 0 {name=V3 
 xvalue="dc 0 pulse -.1 .1 1m .1u .1u 10.1u 20u" 
-value="dc 0 sin 0 1 \{frequ\} 1m"
+value="dc 0 sin 0 0.5 \{frequ\} 1m"
 }
 C {res.sym} 240 -810 0 1 {name=R4 m=1 value=100k}
 C {lab_pin.sym} 240 -860 0 0 {name=p18 lab=VPP}
@@ -338,7 +338,8 @@ spice_ignore=0
 value="
 .option ITL4=20000 ITL5=0
 vvss vss 0 dc 0 
-.temp 30
+.temp 27
+.param VPP=50
 .param frequ=5k
 .param gain=45
 .option savecurrents
@@ -351,13 +352,30 @@ vvss vss 0 dc 0
 save all
 op
 write poweramp_op.raw
-tran  8e-7 0.07 uic
+tran  8e-7 0.025 uic
 * .FOUR 20k v(outm,outp)
 * .probe i(*) 
-plot outp outm
 save p(r*) p(v*)
 write poweramp.raw
+
+alterparam VPP=30
+reset
+
+save all
+op
+write poweramp_op2.raw
+tran  8e-7 0.025 uic
+* .FOUR 20k v(outm,outp)
+* .probe i(*) 
+save p(r*) p(v*)
+write poweramp2.raw
+
+
+
+
 quit 0
+
+
 .endc
 "}
 C {simulator_commands.sym} 1020 -870 0 0 {name=COMMANDS1
@@ -423,3 +441,6 @@ simswap
 
 "
 }
+C {launcher.sym} 1000 -220 0 0 {name=h8
+descr="Backannotate2"
+tclcommand="xschem annotate_op $netlist_dir/poweramp_op2.raw"}