diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java
index 6ae8f0765..037f753fc 100644
--- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java
+++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java
@@ -82,6 +82,7 @@ public abstract class CachedElementMap<T extends StrolchRootElement> extends Tra
 				element.setVersion(getBy(tx, element.getType(), element.getId(), true).getVersion());
 			Version.updateVersionFor(element, tx.getCertificate().getUsername(), deleted);
 		} else {
+			element.setVersion(getBy(tx, element.getType(), element.getId(), true).getVersion());
 			Version.updateVersionFor(element, 0, tx.getCertificate().getUsername(), deleted);
 		}
 	}
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientElementMap.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientElementMap.java
index 2b0f7c5e7..81842e69e 100644
--- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientElementMap.java
+++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientElementMap.java
@@ -302,6 +302,7 @@ public abstract class TransientElementMap<T extends StrolchRootElement> implemen
 
 	@Override
 	public synchronized void update(StrolchTransaction tx, T element) {
+		element.setVersion(getBy(tx, element.getType(), element.getId(), true).getVersion());
 		Version.updateVersionFor(element, 0, tx.getCertificate().getUsername(), false);
 		internalUpdate(tx, element);
 	}
@@ -330,6 +331,7 @@ public abstract class TransientElementMap<T extends StrolchRootElement> implemen
 	@Override
 	public synchronized void updateAll(StrolchTransaction tx, List<T> elements) {
 		for (T element : elements) {
+			element.setVersion(getBy(tx, element.getType(), element.getId(), true).getVersion());
 			Version.updateVersionFor(element, 0, tx.getCertificate().getUsername(), false);
 			internalUpdate(tx, element);
 		}