diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
index 0ae7db7e84..6a56391126 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -123,6 +124,11 @@ public String getSourceText() throws IOException {
     return SerializationUtil.getCompleteContent(this);
   }
 
+  @Override
+  protected LinkedHashSet<Triple<EObject, EReference, INode>> getResolvingSet(final boolean initial) {
+    return resolving;
+  }
+
   /**
    * Sets whether this resource is currently being loaded.
    * <p>
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index 47752238b8..3305a25c79 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -55,7 +55,7 @@
     <pmd.plugin.version>3.26.0</pmd.plugin.version>
     <pmd.version>7.13.0</pmd.version>
     <tycho.version>4.0.13</tycho.version>
-    <xtend.version>2.38.0</xtend.version>
+    <xtend.version>2.39.0</xtend.version>
   </properties>
 
   <modules>
diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index f4647b2629..8b800c0ec8 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -37,7 +37,7 @@
     <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
     <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
     <unit id="org.eclipse.xtext.xtext.generator" version="0.0.0"/>
-    <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.38.0/"/>
+    <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.39.0/"/>
   </location>
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
     <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1/"/>