diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java b/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
index dec72dd46..e6a54343e 100644
--- a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
+++ b/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
@@ -891,6 +891,14 @@ public abstract class AbstractTransaction implements StrolchTransaction {
 			addModelChangeCommands();
 			validateCommands();
 			doCommands();
+
+			// do it twice, since some commands might generate new model changes
+			if (this.objectFilter != null && !this.objectFilter.isEmpty()) {
+				addModelChangeCommands();
+				validateCommands();
+				doCommands();
+			}
+
 			writeChanges();
 
 			long auditTrailDuration = writeAuditTrail();