diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
index 15bad5be6..8e272763d 100644
--- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
+++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
@@ -89,8 +89,7 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
     private Task extractTask(List<DomainDependency<T>> accumulatedDependencies,
             T data, TaskContainer parent) {
         ITaskFundamentalProperties adapted = adapter.adapt(data);
-        accumulatedDependencies
-                .addAll(adapter.getDependenciesOriginating(data));
+        accumulatedDependencies.addAll(adapter.getOutcomingDependencies(data));
         final Task result;
         if (navigator.isLeaf(data)) {
             result = new TaskLeaf(adapted);
diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java
index fbc8420fb..8a74e0e0e 100644
--- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java
+++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java
@@ -17,7 +17,13 @@ public class AutoAdapter implements
     }
 
     @Override
-    public List<DomainDependency<ITaskFundamentalProperties>> getDependenciesOriginating(
+    public List<DomainDependency<ITaskFundamentalProperties>> getOutcomingDependencies(
+            ITaskFundamentalProperties object) {
+        return new ArrayList<DomainDependency<ITaskFundamentalProperties>>();
+    }
+
+    @Override
+    public List<DomainDependency<ITaskFundamentalProperties>> getIncomingDependencies(
             ITaskFundamentalProperties object) {
         return new ArrayList<DomainDependency<ITaskFundamentalProperties>>();
     }
diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java
index 8fcbe9fce..85b2bbd43 100644
--- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java
+++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java
@@ -12,7 +12,9 @@ public interface IAdapterToTaskFundamentalProperties<T> {
 
     public ITaskFundamentalProperties adapt(T object);
 
-    public List<DomainDependency<T>> getDependenciesOriginating(T object);
+    public List<DomainDependency<T>> getOutcomingDependencies(T object);
+
+    public List<DomainDependency<T>> getIncomingDependencies(T object);
 
     public boolean canAddDependency(DomainDependency<T> dependency);
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
index 833d241a5..642b269ca 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
@@ -156,7 +156,7 @@ public class DataForPlanner {
         return new PlannerConfiguration<ITaskFundamentalProperties>(
                 new AutoAdapter() {
                     @Override
-                    public List<DomainDependency<ITaskFundamentalProperties>> getDependenciesOriginating(
+                    public List<DomainDependency<ITaskFundamentalProperties>> getOutcomingDependencies(
                             ITaskFundamentalProperties object) {
                         List<DomainDependency<ITaskFundamentalProperties>> result = new ArrayList<DomainDependency<ITaskFundamentalProperties>>();
                         if (child1 == object) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
index 7230ec102..752490e18 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
@@ -1,9 +1,9 @@
 package org.navalplanner.web.planner;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.planner.entities.Dependency;
@@ -115,13 +115,25 @@ public class TaskElementAdapter implements ITaskElementAdapter {
     }
 
     @Override
-    public List<DomainDependency<TaskElement>> getDependenciesOriginating(
+    public List<DomainDependency<TaskElement>> getIncomingDependencies(
             TaskElement taskElement) {
-        Set<Dependency> dependenciesWithThisOrigin = taskElement
-                .getDependenciesWithThisOrigin();
+        return toDomainDependencies(taskElement
+                .getDependenciesWithThisDestination());
+    }
+
+    @Override
+    public List<DomainDependency<TaskElement>> getOutcomingDependencies(
+            TaskElement taskElement) {
+        return toDomainDependencies(taskElement
+                .getDependenciesWithThisOrigin());
+    }
+
+    private List<DomainDependency<TaskElement>> toDomainDependencies(
+            Collection<? extends Dependency> dependencies) {
         List<DomainDependency<TaskElement>> result = new ArrayList<DomainDependency<TaskElement>>();
-        for (Dependency dependency : dependenciesWithThisOrigin) {
-            result.add(DomainDependency.createDependency(taskElement,
+        for (Dependency dependency : dependencies) {
+            result.add(DomainDependency.createDependency(
+                    dependency.getOrigin(),
                     dependency.getDestination(), toGanntType(dependency
                             .getType())));
         }
@@ -175,4 +187,5 @@ public class TaskElementAdapter implements ITaskElementAdapter {
         source.removeDependencyWithDestination(dependency.getDestination(),
                 type);
     }
+
 }