diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp
index b991b8e14e..9654b30747 100644
--- a/src/Mod/TechDraw/App/Cosmetic.cpp
+++ b/src/Mod/TechDraw/App/Cosmetic.cpp
@@ -255,7 +255,7 @@ void CosmeticEdge::Save(Base::Writer &writer) const
         circ->Save(writer);
     } else if (m_geometry->getGeomType() == TechDraw::GeomType::ARCOFCIRCLE) {
         TechDraw::AOCPtr aoc = std::static_pointer_cast<TechDraw::AOC>(m_geometry);
-        aoc->Save(writer);
+        aoc->inverted()->Save(writer);
     } else {
         Base::Console().Warning("CE::Save - unimplemented geomType: %d\n", static_cast<int>(m_geometry->getGeomType()));
     }
@@ -298,9 +298,9 @@ void CosmeticEdge::Restore(Base::XMLReader &reader)
         TechDraw::AOCPtr aoc = std::make_shared<TechDraw::AOC> ();
         aoc->Restore(reader);
         aoc->setOCCEdge(GeometryUtils::edgeFromCircleArc(aoc));
-        m_geometry = aoc;
-        permaStart = aoc->startPnt;
-        permaEnd   = aoc->endPnt;
+        m_geometry = aoc->inverted();
+        permaStart = aoc->center;
+        permaEnd   = aoc->center;
         permaRadius = aoc->radius;
     } else {
         Base::Console().Warning("CE::Restore - unimplemented geomType: %d\n", static_cast<int>(gType));
diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp
index 07df28f69d..acbc68f4b8 100644
--- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp
@@ -109,7 +109,7 @@ void TaskCosmeticCircle::changeEvent(QEvent *e)
 
 void TaskCosmeticCircle::setUiPrimary()
 {
-    setWindowTitle(QObject::tr("Create Cosmetic Line"));
+    setWindowTitle(QObject::tr("Create Cosmetic Circle"));
 //    Base::Console().Message("TCC::setUiPrimary() - m_center: %s is3d: %d\n",
 //        DU::formatVector(m_center).c_str(), m_is3d);
     double rotDeg = m_partFeat->Rotation.getValue();
@@ -143,7 +143,7 @@ void TaskCosmeticCircle::setUiPrimary()
 
 void TaskCosmeticCircle::setUiEdit()
 {
-    setWindowTitle(QObject::tr("Edit Cosmetic Line"));
+    setWindowTitle(QObject::tr("Edit Cosmetic Circle"));
 
     ui->rb2d1->setChecked(true);
     ui->rb3d1->setChecked(false);