diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/AbstractEntityAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/AbstractEntityAdaptor.java
index 3c26663825a9190683b3610037979025e6da645c..c582d20c3b8f8b0d8443a9937f50da3e7ee71771 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/AbstractEntityAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/AbstractEntityAdaptor.java
@@ -77,7 +77,7 @@ public class AbstractEntityAdaptor implements IEntityAdaptor
 
     public void addProperty(IEntityPropertyAdaptor property)
     {
-        propertiesByCode.put(property.propertyTypeCode(), property);
+        propertiesByCode.put(property.propertyTypeCode().toUpperCase(), property);
     }
 
     public String code()