diff --git a/src/Mod/Part/App/GeometryDefaultExtension.cpp b/src/Mod/Part/App/GeometryDefaultExtension.cpp
index 426df6de85..43c906588a 100644
--- a/src/Mod/Part/App/GeometryDefaultExtension.cpp
+++ b/src/Mod/Part/App/GeometryDefaultExtension.cpp
@@ -83,20 +83,20 @@ PyObject * GeometryDefaultExtension<T>::getPyObject(void)
 
 // ----------------------------- Template specialisations----------------------------------------------------
 
-//typedef Part::GeometryDefaultExtension<int> GeometryIntExtension;
+//typedef Part::GeometryDefaultExtension<long> GeometryIntExtension;
 //typedef Part::GeometryStringExtension<std::string> GeometryStringExtension;
 
 // ---------- GeometryIntExtension ----------
 TYPESYSTEM_SOURCE_TEMPLATE_T(Part::GeometryIntExtension,Part::GeometryExtension)
 
 template <>
-PyObject * GeometryDefaultExtension<int>::getPyObject(void)
+PyObject * GeometryDefaultExtension<long>::getPyObject(void)
 {
     return new GeometryIntExtensionPy(new GeometryIntExtension(this->value));
 }
 
 template <>
-void GeometryDefaultExtension<int>::Restore(Base::XMLReader &reader)
+void GeometryDefaultExtension<long>::Restore(Base::XMLReader &reader)
 {
     value = reader.getAttributeAsInteger("value");
 }
diff --git a/src/Mod/Part/App/GeometryDefaultExtension.h b/src/Mod/Part/App/GeometryDefaultExtension.h
index 2276035808..240b3692e5 100644
--- a/src/Mod/Part/App/GeometryDefaultExtension.h
+++ b/src/Mod/Part/App/GeometryDefaultExtension.h
@@ -83,7 +83,7 @@ namespace Part {
     // 6. Register your type and corresponding python type in AppPart.cpp
 
     // Prefer alias to typedef item 9
-    using GeometryIntExtension = GeometryDefaultExtension<int>;
+    using GeometryIntExtension = GeometryDefaultExtension<long>;
     using GeometryStringExtension = GeometryDefaultExtension<std::string>;
 }
 
diff --git a/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp b/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp
index 5bb42f8d9e..ea14102cc2 100644
--- a/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp
+++ b/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp
@@ -55,7 +55,7 @@ int GeometryIntExtensionPy::PyInit(PyObject* args, PyObject* /*kwd*/)
     }
 
     PyErr_Clear();
-    int Id;
+    long Id;
     if (PyArg_ParseTuple(args, "i", &Id)) {
         this->getGeometryIntExtensionPtr()->setValue(Id);
         return 0;
@@ -65,7 +65,7 @@ int GeometryIntExtensionPy::PyInit(PyObject* args, PyObject* /*kwd*/)
 
     PyErr_SetString(PyExc_TypeError, "GeometryIntExtension constructor accepts:\n"
     "-- empty parameter list\n"
-    "-- int\n");
+    "-- long int\n");
     return -1;
 }