diff --git a/xschem_library/devices/bsource.sym b/xschem_library/devices/bsource.sym
index 89929bfa..7e642017 100644
--- a/xschem_library/devices/bsource.sym
+++ b/xschem_library/devices/bsource.sym
@@ -34,9 +34,9 @@ L 4 -15 -25 -15 -15 {}
 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 -17.5 0 0 0.2 0.2 {}
-T {@VAR
-@FUNC} 20 0 0 0 0.2 0.2 {}
 T {@#0:net_name} 5 -42.5 0 0 0.15 0.15 {layer=15 hide=instance}
 T {@#1:net_name} 5 32.5 0 0 0.15 0.15 {layer=15 hide=instance}
 T {@spice_get_current} -12.5 7.5 0 1 0.2 0.2 {layer=17}
+T {@name} 20 -27.5 0 0 0.2 0.2 {}
+T {@VAR = @FUNC
+m=@m} 20 -10 0 0 0.2 0.2 {}