diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java
index dd6ee9061d898ca8a4f58a902f3296a0258ea96c..a4c20e80a24eaea39eff456b8806ae0f20a09776 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java
@@ -37,9 +37,9 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IExperimentDAO;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.PersistencyResources;
 import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ColumnNames;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE.EntityType;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPropertyPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentTypePE;
@@ -305,14 +305,15 @@ public class ExperimentDAO extends AbstractGenericEntityWithPropertiesDAO<Experi
         final String sqlSelectAttachmentContentIds =
                 SQLBuilder.createSelectAttachmentContentIdsSQL(ColumnNames.EXPERIMENT_COLUMN);
         final String sqlDeleteAttachmentContents = SQLBuilder.createDeleteAttachmentContentsSQL();
-        final String sqlDeleteAttachments = SQLBuilder.createDeleteAttachmentsSQL();
+        final String sqlDeleteAttachments =
+                SQLBuilder.createDeleteAttachmentsSQL(ColumnNames.EXPERIMENT_COLUMN);
         final String sqlDeleteExperiments = SQLBuilder.createDeleteEnitiesSQL(experimentsTable);
         final String sqlInsertEvent = SQLBuilder.createInsertEventSQL();
 
-        executePermanentDeleteAction(EntityKind.EXPERIMENT, experimentIds, registrator, reason,
+        executePermanentDeleteAction(EntityType.EXPERIMENT, experimentIds, registrator, reason,
                 sqlSelectPermIds, sqlDeleteProperties, sqlSelectAttachmentContentIds,
-                sqlDeleteAttachmentContents, sqlDeleteAttachments, sqlDeleteExperiments,
-                sqlInsertEvent);
+                sqlSelectAttachmentContentIds, sqlDeleteAttachments, sqlDeleteAttachmentContents,
+                sqlDeleteExperiments, sqlInsertEvent);
     }
 
     @Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java
index 0b86bb14cce45641609f3ae4a57b6fb0fa02ffcf..c2c06e6ba37edd6983f80976fdb612028369ac7b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java
@@ -41,9 +41,9 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISampleDAO;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.PersistencyResources;
 import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ColumnNames;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE.EntityType;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePropertyPE;
@@ -391,13 +391,14 @@ public class SampleDAO extends AbstractGenericEntityWithPropertiesDAO<SamplePE>
         final String sqlSelectAttachmentContentIds =
                 SQLBuilder.createSelectAttachmentContentIdsSQL(ColumnNames.SAMPLE_COLUMN);
         final String sqlDeleteAttachmentContents = SQLBuilder.createDeleteAttachmentContentsSQL();
-        final String sqlDeleteAttachments = SQLBuilder.createDeleteAttachmentsSQL();
+        final String sqlDeleteAttachments =
+                SQLBuilder.createDeleteAttachmentsSQL(ColumnNames.SAMPLE_COLUMN);
         final String sqlDeleteSamples = SQLBuilder.createDeleteEnitiesSQL(samplesTable);
         final String sqlInsertEvent = SQLBuilder.createInsertEventSQL();
 
-        executePermanentDeleteAction(EntityKind.SAMPLE, sampleIds, registrator, reason, sqlSelectPermIds,
-                sqlDeleteProperties, sqlSelectAttachmentContentIds, sqlDeleteAttachmentContents,
-                sqlDeleteAttachments, sqlDeleteSamples, sqlInsertEvent);
+        executePermanentDeleteAction(EntityType.SAMPLE, sampleIds, registrator, reason,
+                sqlSelectPermIds, sqlDeleteProperties, sqlSelectAttachmentContentIds,
+                sqlDeleteAttachmentContents, sqlDeleteAttachments, sqlDeleteSamples, sqlInsertEvent);
     }
 
     public Set<TechId> listSampleIdsByChildrenIds(final Collection<TechId> children,