diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py
index 871a34e1f2..e30c3ba8a4 100644
--- a/src/Mod/Fem/femsolver/calculix/writer.py
+++ b/src/Mod/Fem/femsolver/calculix/writer.py
@@ -347,9 +347,9 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
         # get the element ids for face and edge elements and write them into the objects
         if len(self.shellthickness_objects) > 1:
             self.get_element_geometry2D_elements()
-        elif len(self.beamsection_objects) > 1:
+        if len(self.beamsection_objects) > 1:
             self.get_element_geometry1D_elements()
-        elif len(self.fluidsection_objects) > 1:
+        if len(self.fluidsection_objects) > 1:
             self.get_element_fluid1D_elements()
 
         # get the element ids for material objects and write them into the material object
@@ -364,15 +364,15 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
                 # but a mesh could contain the element faces of the volumes as faces
                 # and the edges of the faces as edges, there we have to check for some geometric objects
                 self.get_ccx_elsets_single_mat_solid()
-            elif len(self.shellthickness_objects) == 1:
+            if len(self.shellthickness_objects) == 1:
                 self.get_ccx_elsets_single_mat_single_shell()
             elif len(self.shellthickness_objects) > 1:
                 self.get_ccx_elsets_single_mat_multiple_shell()
-            elif len(self.beamsection_objects) == 1:
+            if len(self.beamsection_objects) == 1:
                 self.get_ccx_elsets_single_mat_single_beam()
             elif len(self.beamsection_objects) > 1:
                 self.get_ccx_elsets_single_mat_multiple_beam()
-            elif len(self.fluidsection_objects) == 1:
+            if len(self.fluidsection_objects) == 1:
                 self.get_ccx_elsets_single_mat_single_fluid()
             elif len(self.fluidsection_objects) > 1:
                 self.get_ccx_elsets_single_mat_multiple_fluid()
@@ -383,15 +383,15 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
                 # but a mesh could contain the element faces of the volumes as faces
                 # and the edges of the faces as edges, there we have to check for some geometric objects
                 self.get_ccx_elsets_multiple_mat_solid()  # volume is a bit special, because retrieving ids from group mesh data is implemented
-            elif len(self.shellthickness_objects) == 1:
+            if len(self.shellthickness_objects) == 1:
                 self.get_ccx_elsets_multiple_mat_single_shell()
             elif len(self.shellthickness_objects) > 1:
                 self.get_ccx_elsets_multiple_mat_multiple_shell()
-            elif len(self.beamsection_objects) == 1:
+            if len(self.beamsection_objects) == 1:
                 self.get_ccx_elsets_multiple_mat_single_beam()
             elif len(self.beamsection_objects) > 1:
                 self.get_ccx_elsets_multiple_mat_multiple_beam()
-            elif len(self.fluidsection_objects) == 1:
+            if len(self.fluidsection_objects) == 1:
                 self.get_ccx_elsets_multiple_mat_single_fluid()
             elif len(self.fluidsection_objects) > 1:
                 self.get_ccx_elsets_multiple_mat_multiple_fluid()