diff --git a/src/Mod/Fem/FemInputWriter.py b/src/Mod/Fem/FemInputWriter.py
index b9dde5dce..dc60e1f1e 100644
--- a/src/Mod/Fem/FemInputWriter.py
+++ b/src/Mod/Fem/FemInputWriter.py
@@ -41,23 +41,24 @@ import os
 
 
 class FemInputWriter():
-    def __init__(self, analysis_obj, solver_obj,
+    def __init__(self,
+                 analysis_obj, solver_obj,
                  mesh_obj, mat_obj,
-                 fixed_obj,
+                 fixed_obj, displacement_obj,
                  selfweight_obj, force_obj, pressure_obj,
-                 displacement_obj,
                  beamsection_obj, shellthickness_obj,
                  analysis_type, eigenmode_parameters,
-                 dir_name):
+                 dir_name
+                 ):
         self.analysis = analysis_obj
         self.solver_obj = solver_obj
         self.mesh_object = mesh_obj
         self.material_objects = mat_obj
         self.fixed_objects = fixed_obj
+        self.displacement_objects = displacement_obj
         self.selfweight_objects = selfweight_obj
         self.force_objects = force_obj
         self.pressure_objects = pressure_obj
-        self.displacement_objects = displacement_obj
         self.beamsection_objects = beamsection_obj
         self.shellthickness_objects = shellthickness_obj
         self.analysis_type = analysis_type
diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py
index 1aa363942..4b3a5fafb 100644
--- a/src/Mod/Fem/FemInputWriterCcx.py
+++ b/src/Mod/Fem/FemInputWriterCcx.py
@@ -36,22 +36,24 @@ import FemInputWriter
 
 
 class FemInputWriterCcx(FemInputWriter.FemInputWriter):
-    def __init__(self, analysis_obj, solver_obj,
+    def __init__(self,
+                 analysis_obj, solver_obj,
                  mesh_obj, mat_obj,
-                 fixed_obj,
+                 fixed_obj, displacement_obj,
                  selfweight_obj, force_obj, pressure_obj,
-                 displacement_obj,
                  beamsection_obj, shellthickness_obj,
                  analysis_type=None, eigenmode_parameters=None,
-                 dir_name=None):
-        FemInputWriter.FemInputWriter.__init__(self, analysis_obj, solver_obj,
+                 dir_name=None
+                 ):
+        FemInputWriter.FemInputWriter.__init__(self,
+                                               analysis_obj, solver_obj,
                                                mesh_obj, mat_obj,
-                                               fixed_obj,
+                                               fixed_obj, displacement_obj,
                                                selfweight_obj, force_obj, pressure_obj,
-                                               displacement_obj,
                                                beamsection_obj, shellthickness_obj,
                                                analysis_type, eigenmode_parameters,
-                                               dir_name)
+                                               dir_name
+                                               )
         self.file_name = self.dir_name + '/' + self.mesh_object.Name + '.inp'
         print('FemInputWriterCcx --> self.dir_name  -->  ' + self.dir_name)
         print('FemInputWriterCcx --> self.file_name  -->  ' + self.file_name)
diff --git a/src/Mod/Fem/FemInputWriterZ88.py b/src/Mod/Fem/FemInputWriterZ88.py
index e45316776..8508d92e6 100644
--- a/src/Mod/Fem/FemInputWriterZ88.py
+++ b/src/Mod/Fem/FemInputWriterZ88.py
@@ -33,22 +33,24 @@ import FemInputWriter
 
 
 class FemInputWriterZ88(FemInputWriter.FemInputWriter):
-    def __init__(self, analysis_obj, solver_obj,
+    def __init__(self,
+                 analysis_obj, solver_obj,
                  mesh_obj, mat_obj,
-                 fixed_obj,
-                 force_obj, pressure_obj,
-                 displacement_obj,
+                 fixed_obj, displacement_obj,
+                 selfweight_obj, force_obj, pressure_obj,
                  beamsection_obj, shellthickness_obj,
                  analysis_type=None, eigenmode_parameters=None,
-                 dir_name=None):
-        FemInputWriter.FemInputWriter.__init__(self, analysis_obj, solver_obj,
+                 dir_name=None
+                 ):
+        FemInputWriter.FemInputWriter.__init__(self,
+                                               analysis_obj, solver_obj,
                                                mesh_obj, mat_obj,
-                                               fixed_obj,
-                                               force_obj, pressure_obj,
-                                               displacement_obj,
+                                               fixed_obj, displacement_obj,
+                                               selfweight_obj, force_obj, pressure_obj,
                                                beamsection_obj, shellthickness_obj,
                                                analysis_type, eigenmode_parameters,
-                                               dir_name)
+                                               dir_name
+                                               )
         self.file_name = self.dir_name + '/z88'
         print('FemInputWriterZ88 --> self.dir_name  -->  ' + self.dir_name)
         print('FemInputWriterZ88 --> self.file_name  -->  ' + self.file_name)
diff --git a/src/Mod/Fem/FemToolsCcx.py b/src/Mod/Fem/FemToolsCcx.py
index 64443e596..895c0397a 100644
--- a/src/Mod/Fem/FemToolsCcx.py
+++ b/src/Mod/Fem/FemToolsCcx.py
@@ -88,14 +88,15 @@ class FemToolsCcx(FemTools.FemTools):
         import sys
         self.inp_file_name = ""
         try:
-            inp_writer = iw.FemInputWriterCcx(self.analysis, self.solver,
+            inp_writer = iw.FemInputWriterCcx(
+                                              self.analysis, self.solver,
                                               self.mesh, self.materials,
-                                              self.fixed_constraints,
+                                              self.fixed_constraints, self.displacement_constraints,
                                               self.selfweight_constraints, self.force_constraints, self.pressure_constraints,
-                                              self.displacement_constraints,
                                               self.beam_sections, self.shell_thicknesses,
                                               self.analysis_type, self.eigenmode_parameters,
-                                              self.working_dir)
+                                              self.working_dir
+                                             )
             self.inp_file_name = inp_writer.write_calculix_input_file()
         except:
             print("Unexpected error when writing CalculiX input file:", sys.exc_info()[0])
diff --git a/src/Mod/Fem/FemToolsZ88.py b/src/Mod/Fem/FemToolsZ88.py
index 9eb8bba72..8dd664b79 100644
--- a/src/Mod/Fem/FemToolsZ88.py
+++ b/src/Mod/Fem/FemToolsZ88.py
@@ -80,14 +80,15 @@ class FemToolsZ88(FemTools.FemTools):
         import sys
         self.inp_file_name = ""
         try:
-            inp_writer = iw.FemInputWriterZ88(self.analysis, self.solver,
+            inp_writer = iw.FemInputWriterZ88(
+                                              self.analysis, self.solver,
                                               self.mesh, self.materials,
-                                              self.fixed_constraints,
-                                              self.force_constraints, self.pressure_constraints,
-                                              self.displacement_constraints,
+                                              self.fixed_constraints, self.displacement_constraints,
+                                              self.selfweight_constraints, self.force_constraints, self.pressure_constraints,
                                               self.beam_sections, self.shell_thicknesses,
                                               self.analysis_type, None,
-                                              self.working_dir)
+                                              self.working_dir
+                                             )
             self.inp_file_name = inp_writer.write_z88_input()
         except:
             print("Unexpected error when writing Z88 input files:", sys.exc_info()[0])