diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1f56b7e8ec..0dfcdc0a1b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,12 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-09-26 15:34 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
+  * contrib/rddads/ads1.c
+    ! extended and fixed CANDEFAULT error processing for data width error
+  * contrib/rddads/adsx.c
+    ! fixed typo in index creation code related to subindexing
+
 2014-09-25 00:04 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/sddsqlt3/core.c
     + map columns with SQLITE_NULL values as HB_FT_ANY fields
diff --git a/contrib/rddads/ads1.c b/contrib/rddads/ads1.c
index 8c73c43a3c..ad42e1a180 100644
--- a/contrib/rddads/ads1.c
+++ b/contrib/rddads/ads1.c
@@ -2786,8 +2786,8 @@ static HB_ERRCODE adsPutValue( ADSAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem
          commonError( pArea, EG_UNLOCKED, ( HB_ERRCODE ) u32RetVal, 0, NULL, 0, NULL );
       else if( u32RetVal == AE_TABLE_READONLY )
          commonError( pArea, EG_READONLY, ( HB_ERRCODE ) u32RetVal, 0, NULL, 0, NULL );
-      else if( u32RetVal == AE_DATA_TOO_LONG )
-         return commonError( pArea, EG_DATAWIDTH, ( HB_ERRCODE ) u32RetVal, 0, NULL, EF_CANDEFAULT, NULL );
+      else if( u32RetVal == AE_DATA_TOO_LONG || u32RetVal == AE_VALUE_OVERFLOW )
+         return commonError( pArea, EG_DATAWIDTH, ( HB_ERRCODE ) u32RetVal, 0, NULL, EF_CANDEFAULT, NULL ) == E_DEFAULT ? HB_SUCCESS : HB_FAILURE;
       else
          commonError( pArea, EG_WRITE, ( HB_ERRCODE ) u32RetVal, 0, NULL, 0, NULL );
       return HB_FAILURE;
diff --git a/contrib/rddads/adsx.c b/contrib/rddads/adsx.c
index eee226f17f..ba0c87c46b 100644
--- a/contrib/rddads/adsx.c
+++ b/contrib/rddads/adsx.c
@@ -477,7 +477,7 @@ static PMIXTAG mixTagCreate( const char * szTagName, PHB_ITEM pKeyExpr, PHB_ITEM
    if( ulStartRec )
       AdsGotoRecord( pArea->adsarea.hTable, ulStartRec );
    else
-      AdsGotoTop( pArea->adsarea.hTable );
+      AdsGotoTop( hOrder );
    hb_adsUpdateAreaFlags( pArea );
 
    while( ! pArea->adsarea.area.fEof )