diff --git a/Geo/GModel.h b/Geo/GModel.h
index f51b3acaf8c483a881e0e7086e27d3b27904c8b0..a0bfcff95b4141141952a8a03aa61cb1799de16c 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -304,7 +304,7 @@ class GModel
 
   // CFD General Notation System files
   int readCGNS(const std::string &name);
-  int writeCGNS(const std::string &name, const int zoneDefinition,
+  int writeCGNS(const std::string &name, int zoneDefinition,
                 const CGNSOptions &options, double scalingFactor=1.0);
 
   // Med "Modele d'Echange de Donnees" file format (the static routine
diff --git a/Geo/GModelIO_CGNS.cpp b/Geo/GModelIO_CGNS.cpp
index cc69b722e969ad99900d870ad1087776c5a55802..550acb944d53669ac7a68336854518bce205a3b0 100644
--- a/Geo/GModelIO_CGNS.cpp
+++ b/Geo/GModelIO_CGNS.cpp
@@ -243,7 +243,7 @@ int GModel::readCGNS(const std::string &name)
  *
  ******************************************************************************/
 
-int GModel::writeCGNS(const std::string &name, const int zoneDefinition,
+int GModel::writeCGNS(const std::string &name, int zoneDefinition,
                       const CGNSOptions &options, double scalingFactor)
 {
 
@@ -264,6 +264,7 @@ int GModel::writeCGNS(const std::string &name, const int zoneDefinition,
   int meshDim;
 
   Msg::Warning("CGNS I/O is at an \"alpha\" software stage");
+  zoneDefinition = 1;
 
   switch(zoneDefinition) {
   case 1:  // By partition