diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java
index 87d2c9760..c4351b7f4 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java
@@ -1930,6 +1930,23 @@ public class GanttDiagramGraph<V, D extends IDependency<V>> implements
         return result;
     }
 
+    public boolean hasVisibleIncomingDependencies(V task) {
+        return isSomeVisible(graph.incomingEdgesOf(task));
+    }
+
+    public boolean hasVisibleOutcomingDependencies(V task) {
+        return isSomeVisible(graph.outgoingEdgesOf(task));
+    }
+
+    private boolean isSomeVisible(Set<D> dependencies) {
+        for (D each : dependencies) {
+            if (adapter.isVisible(each)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public List<V> getLatestTasks() {
         List<V> tasks = new ArrayList<V>();
 
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculator.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculator.java
index fb3d9e292..039df8897 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculator.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculator.java
@@ -121,13 +121,37 @@ public class CriticalPathCalculator<T, D extends IDependency<T>> {
     }
 
     private InitialNode<T, D> createBeginningOfProjectNode() {
-        return new InitialNode<T, D>(new HashSet<T>(removeContainers(graph
+        return new InitialNode<T, D>(
+                removeWithVisibleIncomingDependencies(removeContainers(graph
                 .getInitialTasks())));
     }
 
+
+    private Set<T> removeWithVisibleIncomingDependencies(Collection<T> tasks) {
+        Set<T> result = new HashSet<T>();
+        for (T each : tasks) {
+            if (!graph.hasVisibleIncomingDependencies(each)) {
+                result.add(each);
+            }
+        }
+        return result;
+    }
+
     private LastNode<T, D> createEndOfProjectNode() {
-        return new LastNode<T, D>(new HashSet<T>(removeContainers(graph
-                .getLatestTasks())));
+        return new LastNode<T, D>(
+                removeWithVisibleOutcomingDependencies(removeContainers(graph
+                        .getLatestTasks())));
+    }
+
+    private Set<T> removeWithVisibleOutcomingDependencies(
+            Collection<T> removeContainers) {
+        Set<T> result = new HashSet<T>();
+        for (T each : removeContainers) {
+            if (!graph.hasVisibleOutcomingDependencies(each)) {
+                result.add(each);
+            }
+        }
+        return result;
     }
 
     private Map<T, Node<T, D>> createGraphNodes() {
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/ICriticalPathCalculable.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/ICriticalPathCalculable.java
index 6d979ed35..b2899977c 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/ICriticalPathCalculable.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/ICriticalPathCalculable.java
@@ -42,6 +42,10 @@ public interface ICriticalPathCalculable<T> {
 
     List<T> getLatestTasks();
 
+    boolean hasVisibleIncomingDependencies(T task);
+
+    boolean hasVisibleOutcomingDependencies(T task);
+
     Set<T> getIncomingTasksFor(T task);
 
     Set<T> getOutgoingTasksFor(T task);