diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 314f92d7dd..7a8b8e92b2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+19990722-10:50 EDT Paul Tucker <ptucker@sympatico.ca>
+    *source/rtl/dir.c
+       * corrected hang when passing a second param to dirtest.
+
 19990722-16:30 GMT+2 Ryszard Glab <rglab@imid.med.pl>
 
     *source/compiler/harbour.y
diff --git a/harbour/source/rtl/dir.c b/harbour/source/rtl/dir.c
index c89274150d..6dab1e83e9 100644
--- a/harbour/source/rtl/dir.c
+++ b/harbour/source/rtl/dir.c
@@ -300,7 +300,11 @@ HARBOUR HB_DIRECTORY( void )
          if( arg2_it && hb_parclen(2) >= 1)
          {
             strcpy(string, hb_parc(2));
-            while (*pos != '\0') *pos = toupper(*pos);
+            while (*pos != '\0')
+            {
+               *pos = toupper(*pos);
+               pos++;
+            }
             pos = strchr(string,*aatrib);
          }
          else