diff -r 7b0558c52de3 -r 0248790c66ea lemon/ugraph_adaptor.h
--- a/lemon/ugraph_adaptor.h	Thu Mar 01 16:04:12 2007 +0000
+++ b/lemon/ugraph_adaptor.h	Thu Mar 01 16:47:23 2007 +0000
@@ -151,20 +151,20 @@
 
     typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 
-    NodeNotifier& getNotifier(Node) const {
-      return graph->getNotifier(Node());
+    NodeNotifier& notifier(Node) const {
+      return graph->notifier(Node());
     } 
 
     typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
 
-    EdgeNotifier& getNotifier(Edge) const {
-      return graph->getNotifier(Edge());
+    EdgeNotifier& notifier(Edge) const {
+      return graph->notifier(Edge());
     } 
 
     typedef typename ItemSetTraits<Graph, UEdge>::ItemNotifier UEdgeNotifier;
 
-    UEdgeNotifier& getNotifier(UEdge) const {
-      return graph->getNotifier(UEdge());
+    UEdgeNotifier& notifier(UEdge) const {
+      return graph->notifier(UEdge());
     } 
 
     template <typename _Value>
@@ -311,6 +311,7 @@
     void firstInc(UEdge& i, bool& d, const Node& n) const { 
       Parent::firstInc(i, d, n); 
       while (i!=INVALID && (!(*uedge_filter_map)[i] 
+            || !(*node_filter_map)[Parent::source(i)]
             || !(*node_filter_map)[Parent::target(i)])) Parent::nextInc(i, d); 
     }
 
@@ -347,8 +348,9 @@
 
     void nextInc(UEdge& i, bool& d) const { 
       Parent::nextInc(i, d); 
-      while (i!=INVALID && (!(*uedge_filter_map)[i] 
-            || !(*node_filter_map)[Parent::source(i)])) Parent::nextInc(i, d); 
+      while (i!=INVALID && (!(*uedge_filter_map)[i]
+            || !(*node_filter_map)[Parent::source(i)]
+            || !(*node_filter_map)[Parent::target(i)])) Parent::nextInc(i, d); 
     }
 
     /// \brief Hide the given node in the graph.
@@ -987,14 +989,14 @@
 
     typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 
-    NodeNotifier& getNotifier(Node) const {
-      return graph->getNotifier(Node());
+    NodeNotifier& notifier(Node) const {
+      return graph->notifier(Node());
     } 
 
     typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
 
-    EdgeNotifier& getNotifier(Edge) const {
-      return graph->getNotifier(Edge());
+    EdgeNotifier& notifier(Edge) const {
+      return graph->notifier(Edge());
     } 
 
     template <typename _Value>