diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index d7ee0a5f10..55f35fe0e1 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -2963,7 +2963,7 @@ abstract class MetaModel
 						self::$m_aMagicFields[] = $sClass;
 					}
 					self::$m_aMagicFields[$sClass][] = $sCode;
-					//self::$m_aAttribOrigins[$sClass][$sCode] = self::$m_aAttribOrigins[$sClass][$sAttCode];
+					self::$m_aAttribOrigins[$sClass][$sCode] = self::$m_aAttribOrigins[$sClass][$sAttCode];
 				}
 				if (!$oAttDef->IsSearchable()) {
 					if (!array_key_exists($sClass, self::$m_aFilterForbiddenAttributes)) {
diff --git a/tests/php-unit-tests/unitary-tests/core/OQLResolverTest.php b/tests/php-unit-tests/unitary-tests/core/OQLResolverTest.php
index b5bc2abc5f..eda0d7bf64 100644
--- a/tests/php-unit-tests/unitary-tests/core/OQLResolverTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/OQLResolverTest.php
@@ -32,8 +32,6 @@ class OQLResolverTest extends ItopCustomDatamodelTestCase
 		$oSet = new DBObjectSet($oSearch);
 		$oSet->OptimizeColumnLoad(['OQLResolverChild' => ['cumulatedpending']]);
 
-		$sQuery = $oSet->GetFilter()->MakeSelectQuery([], [], $oSet->m_aAttToLoad);
-		echo $sQuery."\n";
 		$oActual = $oSet->Fetch();
 
 		// Then