diff --git a/src/Mod/Path/libarea/Curve.cpp b/src/Mod/Path/libarea/Curve.cpp
index d627631961..2c05d14dfd 100644
--- a/src/Mod/Path/libarea/Curve.cpp
+++ b/src/Mod/Path/libarea/Curve.cpp
@@ -185,7 +185,7 @@ void CCurve::AddArcOrLines(bool check_for_arc, std::list<CVertex> &new_vertices,
 	}
 }
 
-void CCurve::FitArcs()
+void CCurve::FitArcs(bool retry)
 {
 	std::list<CVertex> new_vertices;
 
@@ -193,7 +193,6 @@ void CCurve::FitArcs()
 	CArc arc;
 	bool arc_found = false;
 	bool arc_added = false;
-
 	int i = 0;
 	for(std::list<CVertex>::iterator It = m_vertices.begin(); It != m_vertices.end(); It++, i++)
 	{
@@ -220,7 +219,28 @@ void CCurve::FitArcs()
 		}
 	}
 
-	if(might_be_an_arc.size() > 0)AddArcOrLines(false, new_vertices, might_be_an_arc, arc, arc_found, arc_added);
+	if(might_be_an_arc.size() > 0) {
+        // check if the last edge can form an arc with the starting edge
+        if(!retry && 
+           !arc_found &&
+           m_vertices.size()>2 && 
+           m_vertices.begin()->m_type==0 && 
+           IsClosed()) 
+        {
+	        std::list<const CVertex*> tmp;
+            auto it = m_vertices.begin();
+            tmp.push_back(&(*it++));
+            tmp.push_back(&(*it));
+            CArc tmpArc;
+            if(CheckForArc(new_vertices.back(),tmp,tmpArc)) {
+                m_vertices.push_front(CVertex(new_vertices.back().m_p));
+                m_vertices.pop_back();
+                FitArcs(true);
+                return;
+            }
+        }
+        AddArcOrLines(false, new_vertices, might_be_an_arc, arc, arc_found, arc_added);
+    }
 
 	if(arc_added)
 	{
diff --git a/src/Mod/Path/libarea/Curve.h b/src/Mod/Path/libarea/Curve.h
index d66215372e..e8b96ce45b 100644
--- a/src/Mod/Path/libarea/Curve.h
+++ b/src/Mod/Path/libarea/Curve.h
@@ -95,13 +95,13 @@ class CCurve
 
 protected:
 	void AddArcOrLines(bool check_for_arc, std::list<CVertex> &new_vertices, std::list<const CVertex*>& might_be_an_arc, CArc &arc, bool &arc_found, bool &arc_added);
-	bool CheckForArc(const CVertex& prev_vt, std::list<const CVertex*>& might_be_an_arc, CArc &arc);
+	static bool CheckForArc(const CVertex& prev_vt, std::list<const CVertex*>& might_be_an_arc, CArc &arc);
 
 public:
 	std::list<CVertex> m_vertices;
 	void append(const CVertex& vertex);
 
-	void FitArcs();
+	void FitArcs(bool retry=false);
 	void UnFitArcs();
 	Point NearestPoint(const Point& p)const;
 	Point NearestPoint(const CCurve& p, double *d = NULL)const;