diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java
index 53abba64b28d62797e43a3b2d61531568a3d446a..32808f02ce8b73b11c56e8526b05508513b092bc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java
@@ -42,9 +42,6 @@ import ch.systemsx.cisd.openbis.generic.shared.util.XmlUtils;
  */
 public final class PropertyValidator implements IPropertyValueValidator
 {
-    private final static Map<DataTypeCode, IDataTypeValidator> dataTypeValidators =
-            createDataTypeValidators();
-
     private final static SimplePropertyValidator simplePropertyValidator =
             new SimplePropertyValidator();
 
@@ -76,7 +73,7 @@ public final class PropertyValidator implements IPropertyValueValidator
         {
             return simplePropertyValidator.validatePropertyValue(entityDataType, value);
         }
-        final IDataTypeValidator dataTypeValidator = dataTypeValidators.get(entityDataType);
+        final IDataTypeValidator dataTypeValidator = createDataTypeValidators().get(entityDataType);
         assert dataTypeValidator != null : String.format("No IDataTypeValidator implementation "
                 + "specified for '%s'.", entityDataType);
         switch (entityDataType)