diff --git a/compiler/pgates/pand2.py b/compiler/pgates/pand2.py
index 48f111c7..b241dc55 100644
--- a/compiler/pgates/pand2.py
+++ b/compiler/pgates/pand2.py
@@ -35,8 +35,9 @@ class pand2(pgate.pgate):
         # Shield the cap, but have at least a stage effort of 4
         self.nand = factory.create(module_type="pnand2",height=self.height) 
         self.add_mod(self.nand)
-        
-        self.inv = factory.create(module_type="pinv", size=self.size, height=self.height)
+
+        # Assume stage effort of 3
+        self.inv = factory.create(module_type="pdriver", neg_polarity=True, fanout=3*self.size, height=self.height)
         self.add_mod(self.inv)
 
     def create_layout(self):
diff --git a/compiler/pgates/pand3.py b/compiler/pgates/pand3.py
index b221ad84..fcca6672 100644
--- a/compiler/pgates/pand3.py
+++ b/compiler/pgates/pand3.py
@@ -35,8 +35,9 @@ class pand3(pgate.pgate):
         # Shield the cap, but have at least a stage effort of 4
         self.nand = factory.create(module_type="pnand3",height=self.height) 
         self.add_mod(self.nand)
-        
-        self.inv = factory.create(module_type="pinv", size=self.size, height=self.height)
+
+        # Assume stage effort of 3
+        self.inv = factory.create(module_type="pdriver", neg_polarity=True, fanout=3*self.size, height=self.height)
         self.add_mod(self.inv)
 
     def create_layout(self):