diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java
index 78484c6f0c1483b686668a0e203f41723f29ca44..0338b3606e61b7668a0a58af3c290b26f718eb83 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java
@@ -34,6 +34,7 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataDAO;
 import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatasetLocation;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IDatasetLocation;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE;
@@ -261,20 +262,10 @@ public final class DeletedDataSetTable extends AbstractDataSetBusinessObject imp
     private IDatasetLocation asDatasetLocation(final DeletedExternalDataPE dataSet)
     {
         assert dataSet != null;
-
-        return new IDatasetLocation()
-            {
-
-                public String getDataSetLocation()
-                {
-                    return dataSet.getLocation();
-                }
-
-                public String getDataSetCode()
-                {
-                    return dataSet.getCode();
-                }
-            };
+        final DatasetLocation result = new DatasetLocation();
+        result.setDatasetCode(dataSet.getCode());
+        result.setDataSetLocation(dataSet.getLocation());
+        return result;
     }
 
 }
\ No newline at end of file