diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 476e1cb32..c69cb2622 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -1778,7 +1778,7 @@ abstract class MetaModel
 						$oFriendlyName = new AttributeFriendlyName($sFriendlyNameAttCode, $sAttCode);
 						$oFriendlyName->SetHostClass($sClass);
 						self::$m_aAttribDefs[$sClass][$sFriendlyNameAttCode] = $oFriendlyName;
-						self::$m_aAttribOrigins[$sClass][$sFriendlyNameAttCode] = $sRemoteClass;
+						self::$m_aAttribOrigins[$sClass][$sFriendlyNameAttCode] = self::$m_aAttribOrigins[$sClass][$sAttCode];
 						$oFriendlyNameFlt = new FilterFromAttribute($oFriendlyName);
 						self::$m_aFilterDefs[$sClass][$sFriendlyNameAttCode] = $oFriendlyNameFlt;
 						self::$m_aFilterOrigins[$sClass][$sFriendlyNameAttCode] = $sRemoteClass;