diff --git a/src/Mod/Draft/draftguitools/gui_arcs.py b/src/Mod/Draft/draftguitools/gui_arcs.py
index a7d458741f..542b081367 100644
--- a/src/Mod/Draft/draftguitools/gui_arcs.py
+++ b/src/Mod/Draft/draftguitools/gui_arcs.py
@@ -342,13 +342,9 @@ class Arc(gui_base_original.Creator):
             end = math.degrees(self.firstangle + self.angle)
             if end < sta:
                 sta, end = end, sta
-            while True:
-                if sta > 360:
-                    sta = sta - 360
-                elif end > 360:
-                    end = end - 360
-                else:
-                    break
+            sta %= 360
+            end %= 360
+
             try:
                 Gui.addModule("Draft")
                 if utils.getParam("UsePartPrimitives", False):
diff --git a/src/Mod/Draft/draftmake/make_circle.py b/src/Mod/Draft/draftmake/make_circle.py
index 3e0a148046..49532e2fad 100644
--- a/src/Mod/Draft/draftmake/make_circle.py
+++ b/src/Mod/Draft/draftmake/make_circle.py
@@ -47,6 +47,9 @@ def make_circle(radius, placement=None, face=None, startangle=None, endangle=Non
 
     Creates a circle object with given parameters.
 
+    If startangle and endangle are provided and not equal, the object will show
+    an arc instead of a full cirle.
+
     Parameters
     ----------
     radius : the radius of the circle.
@@ -58,14 +61,14 @@ def make_circle(radius, placement=None, face=None, startangle=None, endangle=Non
         If face is False, the circle is shown as a wireframe,
         otherwise as a face.
 
-    startangle : start angle of the arc (in degrees)
+    startangle : start angle of the circle (in degrees)
+        Recalculated if not in the -360 to 360 range.
 
-    endangle : end angle of the arc (in degrees)
-        if startangle and endangle are equal, a circle is created,
-        if they are different an arc is created
+    endangle : end angle of the circle (in degrees)
+        Recalculated if not in the -360 to 360 range.
 
     edge : edge.Curve must be a 'Part.Circle'
-        the circle is created from the given edge
+        The circle is created from the given edge.
 
     support :
         TODO: Describe
@@ -113,9 +116,8 @@ def make_circle(radius, placement=None, face=None, startangle=None, endangle=Non
     else:
         obj.Radius = radius
         if (startangle is not None) and (endangle is not None):
-            if startangle == -0: startangle = 0
-            obj.FirstAngle = startangle
-            obj.LastAngle = endangle
+            obj.FirstAngle = math.copysign(abs(startangle) % 360, startangle)
+            obj.LastAngle = math.copysign(abs(endangle) % 360, endangle)
 
     obj.Support = support