diff --git a/ext2spice/ext2hier.c b/ext2spice/ext2hier.c
index d56a3846..5cb2a048 100644
--- a/ext2spice/ext2hier.c
+++ b/ext2spice/ext2hier.c
@@ -663,6 +663,7 @@ spcdevHierVisit(hc, dev, scale)
 			"base", esSpiceF);
 
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcHierWriteParams(hc, dev, scale, l, w, sdM);
 	    break;
 
@@ -790,6 +791,7 @@ spcdevHierVisit(hc, dev, scale)
 			subnode->efnode_name->efnn_hier,
 			"diode_bot", esSpiceF);
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcHierWriteParams(hc, dev, scale, l, w, sdM);
 	    break;
 
@@ -810,6 +812,7 @@ spcdevHierVisit(hc, dev, scale)
 			gate->dterm_node->efnode_name->efnn_hier,
 			"diode_top", esSpiceF);
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcHierWriteParams(hc, dev, scale, l, w, sdM);
 	    break;
 
@@ -1516,8 +1519,8 @@ devDistJunctHierVisit(hc, dev, scale)
 	return 0;
     }
 
-    w = (int)((float)w * scale);
     EFGetLengthAndWidth(dev, &l, &w);
+    w = (int)((float)w * scale);
 
     for (i = 1; i<dev->dev_nterm; i++)
     {
diff --git a/ext2spice/ext2spice.c b/ext2spice/ext2spice.c
index aff8e18c..6947027a 100644
--- a/ext2spice/ext2spice.c
+++ b/ext2spice/ext2spice.c
@@ -2457,6 +2457,7 @@ spcdevVisit(dev, hierName, scale, trans)
 			name, esSpiceF); 
 
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcWriteParams(dev, hierName, scale, l, w, sdM);
 	    break;
 
@@ -2474,6 +2475,7 @@ spcdevVisit(dev, hierName, scale, trans)
 			name, esSpiceF);
 
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcWriteParams(dev, hierName, scale, l, w, sdM);
 	    break;