diff --git a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
index e282f7b9ceed17bbaa9240687ddff1c91469a700..77de2f4b41c7b3a6d70d5e4dea3af73cae542aed 100644
--- a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
+++ b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
@@ -420,11 +420,32 @@ namespace armarx
                 update.entityID = providerID.withEntityName("link to the_answer");
                 update.timeCreated = time;
 
-
                 armem::example::ExampleData data;
 
                 const armem::MemoryID snapshotID = armem::fromIce<armem::MemoryID>(commitResult.results.at(1).snapshotID);
                 armem::toAron(data.memoryLink, snapshotID);
+
+                update.instancesData = { data.toAron() };
+            }
+            armem::CommitResult commitResult = memoryWriter.commit(commit);
+            if (!commitResult.allSuccess())
+            {
+                ARMARX_WARNING << commitResult.allErrorMessages();
+            }
+        }
+
+        // Commit another entity with a self-link
+        {
+            armem::Commit commit;
+            {
+                armem::EntityUpdate& update = commit.updates.emplace_back();
+                update.entityID = providerID.withEntityName("link to self");
+                update.timeCreated = time;
+
+                armem::example::ExampleData data;
+
+                armem::toAron(data.memoryLink, update.entityID.withTimestamp(time));
+
                 update.instancesData = { data.toAron() };
             }
             armem::CommitResult commitResult = memoryWriter.commit(commit);