diff --git a/demo/regress/regress.cpp b/demo/regress/regress.cpp
index 96fa502b..9d169277 100644
--- a/demo/regress/regress.cpp
+++ b/demo/regress/regress.cpp
@@ -137,7 +137,7 @@ istream& get_line(istream& is, nstring_type& s, char delim)
 {
    char c = (char)is.get();
    s.erase(s.begin(), s.end());
-   while((c != delim) && (c != EOF))
+   while((c != delim) && is.good())
    {
       s.append(1, c);
       c = (char)is.get();
@@ -176,7 +176,7 @@ istream& get_line(istream& is, string_type& s, char delim)
 {
    char c = (char)is.get();
    s.erase(s.begin(), s.end());
-   while((c != delim) && (c != EOF))
+   while((c != delim) && is.good())
    {
       s.append(1, c);
       c = (char)is.get();