diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bc589635ba..65cb87fd17 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2003-05-15 21:35 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
+  * tests/testrdd2.prg
+    * some changes, provided by Randy Portnoff
+  * contrib/rdd_ads/ads1.c
+    ! adsInfo() fixed for DBI_GETHEADERSIZE, so Header() returns now correct
+      value ( for dbf tables )
+
 2003-05-15 12:44 UTC+0100 Antonio Linares <alinares@fivetechsoft.com>
   + source/rtl/tget.prg
     ! minor fix
diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c
index 3902eeeb27..b6cb9b6868 100644
--- a/harbour/contrib/rdd_ads/ads1.c
+++ b/harbour/contrib/rdd_ads/ads1.c
@@ -1519,6 +1519,8 @@ static ERRCODE adsInfo( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
          break;
 
       case DBI_GETHEADERSIZE:
+         if( !pArea->uiHeaderLen && pArea->iFileType!=ADS_ADT )
+            pArea->uiHeaderLen = 32 + pArea->uiFieldCount * 32 + 2;
          hb_itemPutNL( pItem, pArea->uiHeaderLen );
          break;
 
diff --git a/harbour/tests/testrdd2.prg b/harbour/tests/testrdd2.prg
index 52ad1be7b9..1e9072311f 100644
--- a/harbour/tests/testrdd2.prg
+++ b/harbour/tests/testrdd2.prg
@@ -45,7 +45,7 @@ case Left( cRDDType := Upper( AllTrim( cRDDType ) ), 3 ) == "ADS"
 
     // Do not include ADS.CH as don't want unintended affects when not using
     // ADS - If need behavior from ADS.CH, include defines and undefs in
-    // thise areas.
+    // these areas.
 
     #define ADS_LOCAL_SERVER  1
     #define ADS_REMOTE_SERVER 2
@@ -87,13 +87,10 @@ case Left( cRDDType := Upper( AllTrim( cRDDType ) ), 3 ) == "ADS"
     #undef ADS_CDX
     #undef ADS_ADT
 
-case cRDDType == "DBFCDX"
+case cRDDType == "DBFCDX" .or. ;
+     cRDDType == "DBFNTX"
 
-    RDDSetDefault( cRDD := "DBFCDX" )
-
-case cRDDType == "DBFNTX"
-
-    RDDSetDefault( cRDD := "DBFNTX" )
+    RDDSetDefault( cRDD := cRDDType )
 
 otherwise
 
@@ -142,6 +139,8 @@ if .not. CompareArray( aStruct, DBStruct() )
     NotifyUser( "Resulting table structure is not what we asked for" )
 endif
 
+// TEST: Header()
+
 if .not. Header() == 194
     NotifyUser( "Header() returned wrong size (" + LTrim( Str( Header() ) ) + " bytes)" )
 endif
@@ -241,6 +240,11 @@ if .not. DbOrderInfo( DBOI_KEYCOUNT ) == MAX_TEST_RECS
     NotifyUser( "Bad DBOI_KEYCOUNT/3" )
 endif
 
+set order to 4
+if .not. DbOrderInfo( DBOI_KEYCOUNT ) == MAX_TEST_RECS
+    NotifyUser( "Bad DBOI_KEYCOUNT/4" )
+endif
+
 // TEST: Character index
 set order to 1
 go top
@@ -296,27 +300,23 @@ if EOF()
     NotifyUser( "LOCATE with EXACT OFF failed" )
 endif
 
-// TEST: EXACT with a index (also tests COUNT)
+// TEST: EXACT with an index (also tests COUNT)
 
 set exact on
 set order to 0
 count for Trim( FIELD->CHAR ) = "A RECORD 1" to xTemp  // Get proper count
 index on CHAR to TESTE for Trim( FIELD->CHAR ) = "A RECORD 1" additive
-set order to 4
 if .not. DbOrderInfo( DBOI_KEYCOUNT ) == xTemp
     NotifyUser( "Bad conditional index count with EXACT ON" )
 endif
-set index to
 
 set exact off
 set order to 0
 count for Trim( FIELD->CHAR ) = "A RECORD 1" to xTemp  // Get proper count
 index on CHAR to TESTE for Trim( FIELD->CHAR ) = "A RECORD 1" additive
-set order to 4
 if .not. DbOrderInfo( DBOI_KEYCOUNT ) == xTemp
     NotifyUser( "Bad conditional index count with EXACT OFF" )
 endif
-set index to
 
 //
 //
@@ -394,7 +394,6 @@ static procedure NotifyUser( cErr, lNotError )
 
 ? cErr
 
-Quit
+Quit  // If remove this, will display all error without stopping
 
 return
-