diff --git a/src/TFunction/TFunction_Iterator.cxx b/src/TFunction/TFunction_Iterator.cxx
index f84fc3dc10..6f1784e09e 100644
--- a/src/TFunction/TFunction_Iterator.cxx
+++ b/src/TFunction/TFunction_Iterator.cxx
@@ -164,7 +164,7 @@ Standard_Boolean TFunction_Iterator::More() const
     }
     return Standard_False;
   }
-  return myPassedFunctions.Extent() < myScope->GetFunctions().Extent();
+  return !myCurrent.IsEmpty();
 }
 
 //=======================================================================