diff --git a/src/Mod/Arch/ArchWall.py b/src/Mod/Arch/ArchWall.py
index 33e99452e6..57764169d3 100644
--- a/src/Mod/Arch/ArchWall.py
+++ b/src/Mod/Arch/ArchWall.py
@@ -734,7 +734,11 @@ class _Wall(ArchComponent.Component):
                         self.basewires = [Part.Wire(obj.Base.Shape.Edges)]
                     else:
                         # self.basewires = obj.Base.Shape.Wires
-                        self.basewires = [Part.Wire(cluster) for cluster in Part.getSortedClusters(obj.Base.Shape.Edges)]
+                        self.basewires = []
+                        for cluster in Part.getSortedClusters(obj.Base.Shape.Edges):
+                            for c in Part.sortEdges(cluster):
+                                self.basewires.append(Part.Wire(c))
+                        
                     if self.basewires and width:
                         if (len(self.basewires) == 1) and layers:
                             self.basewires = [self.basewires[0] for l in layers]