diff --git a/include/scanner.cpp b/include/scanner.cpp
index 173ebde11..03c4b6a6f 100755
--- a/include/scanner.cpp
+++ b/include/scanner.cpp
@@ -61,7 +61,7 @@ TString& TScanner::line(
     _line++;
     _token <<  __tmp_string;
     _token.trim();
-  } while (_token.empty() && !eof());
+  } while (_token.empty() && good());
 
   _pushed = FALSE;