diff --git a/hurricane/src/hurricane/hurricane/IntervalTree.h b/hurricane/src/hurricane/hurricane/IntervalTree.h
index 7d4673b2..f479651c 100644
--- a/hurricane/src/hurricane/hurricane/IntervalTree.h
+++ b/hurricane/src/hurricane/hurricane/IntervalTree.h
@@ -186,8 +186,9 @@ namespace Hurricane {
   template< typename Data >
   typename IntervalTree<Data>::overlap_iterator& IntervalTree<Data>::overlap_iterator::operator++ ()
   {
-    while (this->isValid()) {
+    while ( true ) {
       Super::iterator::operator++();
+      if (not this->isValid()) break;
 
       cdebug_log(0,0) << "IntervalTree::overlap_iterator::operator++() "
                       << ::getString(this->getNode()) << std::endl;