diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index fe84b3603..a029da479 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -2486,7 +2486,7 @@ class MFDocument extends \Combodo\iTop\DesignDocument
 
 		if ($bSafe)
 		{
-			$sXPath .= "[not(@_alteration) or @_alteration!='removed']";
+			$sXPath = "($sXPath)[not(@_alteration) or @_alteration!='removed']";
 		}
 
 		if (is_null($oContextNode))