diff --git a/compiler/base/pin_layout.py b/compiler/base/pin_layout.py
index 40e3c2f5..21bad6bc 100644
--- a/compiler/base/pin_layout.py
+++ b/compiler/base/pin_layout.py
@@ -380,11 +380,19 @@ class pin_layout:
             label_purpose = purpose
 
         newLayout.addBox(layerNumber=layer_num,
-                         purposeNumber=pin_purpose,
+                         purposeNumber=purpose,
                          offsetInMicrons=self.ll(),
                          width=self.width(),
                          height=self.height(),
                          center=False)
+        # Draw a second pin shape too
+        if pin_purpose != purpose:
+            newLayout.addBox(layerNumber=layer_num,
+                             purposeNumber=pin_purpose,
+                             offsetInMicrons=self.ll(),
+                             width=self.width(),
+                             height=self.height(),
+                             center=False)
         # Add the tet in the middle of the pin.
         # This fixes some pin label offsetting when GDS gets
         # imported into Magic.