diff --git a/sources/Core/AttributeDefinition/AttributeClassAttCodeSet.php b/sources/Core/AttributeDefinition/AttributeClassAttCodeSet.php
index e2a4cccbd..b09c61581 100644
--- a/sources/Core/AttributeDefinition/AttributeClassAttCodeSet.php
+++ b/sources/Core/AttributeDefinition/AttributeClassAttCodeSet.php
@@ -84,7 +84,7 @@ class AttributeClassAttCodeSet extends AttributeSet
 					// Add attribute only if not already there (can be in leaf classes but not the root)
 					if (!array_key_exists($sAttCode, $aAllAttributes)) {
 						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-						$sAttDefClass = get_class($oAttDef);
+						$sAttDefClass = $oAttDef->GetTypeShortClassName();
 
 						// Skip excluded attdefs
 						if (isset($aExcludeDefs[$sAttDefClass])) {