diff --git a/panos/firewall.py b/panos/firewall.py
index aafb7564..5349f019 100644
--- a/panos/firewall.py
+++ b/panos/firewall.py
@@ -591,7 +591,6 @@ def is_partial(self):
             self.exclude_device_and_network,
             self.exclude_shared_objects,
             self.exclude_policy_and_objects,
-            self.force,
         ]
 
         return any(x for x in pp_list)
@@ -622,11 +621,9 @@ def element(self):
                 ET.SubElement(partial, "shared-object").text = "excluded"
             if self.exclude_policy_and_objects:
                 ET.SubElement(partial, "policy-and-objects").text = "excluded"
+            fe.append(partial)
 
-            if self.force:
-                fe = ET.SubElement(root, "force")
-                fe.append(partial)
-            else:
-                root.append(partial)
+        if self.force:
+            fe = ET.SubElement(root, "force")
 
         return root
diff --git a/panos/panorama.py b/panos/panorama.py
index 64600ecf..16e36055 100644
--- a/panos/panorama.py
+++ b/panos/panorama.py
@@ -990,7 +990,6 @@ def is_partial(self):
             self.log_collector_groups,
             self.exclude_device_and_network,
             self.exclude_shared_objects,
-            self.force,
         ]
 
         return any(x for x in pp_list)
@@ -1031,12 +1030,10 @@ def element(self):
                 ET.SubElement(partial, "device-and-network").text = "excluded"
             if self.exclude_shared_objects:
                 ET.SubElement(partial, "shared-object").text = "excluded"
+            root.append(partial)
 
-            if self.force:
-                fe = ET.SubElement(root, "force")
-                fe.append(partial)
-            else:
-                root.append(partial)
+        if self.force:
+            fe = ET.SubElement(root, "force")
 
         return root