diff --git a/lib/xmldb/classes/generators/XMLDBGenerator.class.php b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
index 7b37710c4a5..21eb69822b6 100644
--- a/lib/xmldb/classes/generators/XMLDBGenerator.class.php
+++ b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
@@ -937,12 +937,12 @@ class XMLDBgenerator {
             }
         /// Now iterate until not used name is found, incrementing the counter
             while (in_array($newnamewithsuffix, $used_names) || $this->isNameInUse($newnamewithsuffix, $suffix)) {
+                $counter++;
                 $newname = substr($name, 0, strlen($newname)-1) . $counter;
                 $newnamewithsuffix = $newname;
                 if ($suffix) {
                     $newnamewithsuffix = $newnamewithsuffix . '_' . $suffix;
                 }
-                $counter++;
             }
             $namewithsuffix = $newnamewithsuffix;
         }