diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2093cbce00..4e2aabb23f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-10 14:50 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
+   * source/rdd/workarea.c
+     * fixed bug, related to fields handling
+       ( there was a bug report by David Thornley in harbourusers )
+
 2000-10-10 12:50 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
    * contrib/mysql/mysql.c
      * Fix in sqlConnect() for support of versions > 3.22.00
diff --git a/harbour/source/rdd/workarea.c b/harbour/source/rdd/workarea.c
index cb4e104462..e20d1ad224 100644
--- a/harbour/source/rdd/workarea.c
+++ b/harbour/source/rdd/workarea.c
@@ -204,8 +204,10 @@ ERRCODE hb_waAddField( AREAP pArea, LPDBFIELDINFO pFieldInfo )
    /* Validate the name of field */
    ulSize = strlen( ( char * ) pFieldInfo->atomName );
    hb_strLTrim( ( char * ) pFieldInfo->atomName, &ulSize );
+   ulSize = hb_strRTrimLen( ( char * ) pFieldInfo->atomName, ulSize, TRUE );
    if( !ulSize )
       return FAILURE;
+   pFieldInfo->atomName[ulSize] = '\0';
 
    pField = pArea->lpFields + pArea->uiFieldCount;
    if( pArea->uiFieldCount > 0 )