diff --git a/VERSION b/VERSION
index 2acb95f..cb704f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.557
+1.0.558
diff --git a/gf180mcu/magic/gf180mcu.tech b/gf180mcu/magic/gf180mcu.tech
index 6145f9b..0412561 100644
--- a/gf180mcu/magic/gf180mcu.tech
+++ b/gf180mcu/magic/gf180mcu.tech
@@ -5117,10 +5117,10 @@
  device msubcircuit npn_00p54x04p00 npn *ndiff dnwell space/w error a1>2.0 a1<2.2
  device msubcircuit npn_00p54x02p00 npn *ndiff dnwell space/w error a1>1.0 a1<1.2
 
- device msubcircuit pnp_10p00x00p42 pnp *pdiff pwell,space/w error a1>4.1 a1<4.3
- device msubcircuit pnp_05p00x00p42 pnp *pdiff pwell,space/w error a1>2.0 a1<2.2
- device msubcircuit pnp_10p00x10p00 pnp *pdiff pwell,space/w error a1>99.0 a1<101.0
- device msubcircuit pnp_05p00x05p00 pnp *pdiff pwell,space/w error a1>24.0 a1<26.0
+ device msubcircuit pnp_10p00x00p42 pnp pwell,space/w *pdiff error a2>4.1 a2<4.3
+ device msubcircuit pnp_05p00x00p42 pnp pwell,space/w *pdiff error a2>2.0 a2<2.2
+ device msubcircuit pnp_10p00x10p00 pnp pwell,space/w *pdiff error a2>99.0 a2<101.0
+ device msubcircuit pnp_05p00x05p00 pnp pwell,space/w *pdiff error a2>24.0 a2<26.0
 
  device msubcircuit nfet_10v0_asym mvnfet *mvndiff *ldndiff allpsub error \
 	l=l w=w a1=as p1=ps a2=ad p2=pd
diff --git a/gf180mcu/netgen/gf180mcu_setup.tcl b/gf180mcu/netgen/gf180mcu_setup.tcl
index 8ea9578..6ddbdd1 100644
--- a/gf180mcu/netgen/gf180mcu_setup.tcl
+++ b/gf180mcu/netgen/gf180mcu_setup.tcl
@@ -154,6 +154,7 @@
 	property "-circuit1 $dev" delete par1 NRD NRS par
 	property "-circuit1 $dev" delete sa sb sd par dtemp nf
 	property "-circuit1 $dev" delete as ad ps pd
+	property "-circuit1 $dev" \$D \$X \$Y
     }
     if {[lsearch $cells2 $dev] >= 0} {
 	permute "-circuit2 $dev" 1 3
@@ -165,6 +166,7 @@
 	property "-circuit2 $dev" delete par1 NRD NRS par
 	property "-circuit2 $dev" delete sa sb sd par dtemp nf
 	property "-circuit2 $dev" delete as ad ps pd
+	property "-circuit2 $dev" \$D \$X \$Y
     }
 }