diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e425c99c1c..11ff5a7da2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+19991021-16:02 GMT+3 Alexander Kresin
+  * contrib/odbc/todbc.prg
+    * there was an infinite loop in TOdbc():New(),
+    * now it works correctly.
+
 19991021-09:14 GMT+3 Alexander Kresin
   + contrib/odbc/todbc.prg
   + contrib/odbc/readme.txt
diff --git a/harbour/contrib/odbc/todbc.prg b/harbour/contrib/odbc/todbc.prg
index ead6b8900c..5970f9830a 100644
--- a/harbour/contrib/odbc/todbc.prg
+++ b/harbour/contrib/odbc/todbc.prg
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 /*
  * Harbour Project source code:
  * ODBC Access Class
@@ -130,7 +133,7 @@ METHOD New( cODBCStr ) CLASS TODBC
 
    LOCAL xBuf
 
-   WHILE .t.
+//   WHILE .t.
       ::cODBCStr := cODBCStr
       ::Active   := .f.
       ::Fields   := {}
@@ -144,7 +147,7 @@ METHOD New( cODBCStr ) CLASS TODBC
          ::nRetCode := nRet
          alert( "SQLAllocEnvironment Error" )
          alert( ::SQLErrorMessage() )
-         EXIT
+//         EXIT
 
       ENDIF
 
@@ -153,7 +156,7 @@ METHOD New( cODBCStr ) CLASS TODBC
 
       SQLDriverC( ::hDbc, ::cODBCStr, @xBuf )     // Connects to Driver
       ::cODBCRes := xBuf
-   ENDDO
+//   ENDDO
 
 RETURN ( Self )