diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a6a72bda12..de1a47d0b8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2002-09-13 23:30 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+  * source/rtl/dbdelim.prg
+    ! Bug fix for fields that have an embedded delimiter.
+
 2002-09-13 22:20 UTC-0400 David G. Holm <dholm@jsd-llc.com>
   * source/rtl/dbdelim.prg
     ! Bug fixes for consecutive blank fields in a record and for
diff --git a/harbour/source/rtl/dbdelim.prg b/harbour/source/rtl/dbdelim.prg
index 7ec7d2e681..1c2c53d529 100644
--- a/harbour/source/rtl/dbdelim.prg
+++ b/harbour/source/rtl/dbdelim.prg
@@ -298,7 +298,7 @@ row:=row+cSeparator
 nPosSep:=1
 nPosNextSep:=at(cSeparator,row) // seek the first Separator eg. ,
 nPos1Deli:=at(cDelim,row)                // seek the first delimiter "
-nPos2Deli:=at(cDelim,row,nPos1Deli+1)    // seek the second delimiter "
+nPos2Deli:=at(cDelim+cSeparator,row,nPos1Deli+1)    // seek the second delimiter "
 if nPos1Deli > 0 .and. nPos2Deli > 0
    if nPosNextSep>nPos1Deli .and. nPosNextSep<nPos2Deli
       nPosSep:=nPos1Deli
@@ -313,7 +313,7 @@ do while .t.
        exit
     endif
     nPos1Deli:=at(cDelim,row,nPosSep)     // seek the first delimiter "
-    nPos2Deli:=at(cDelim,row,nPos1Deli+1)    // seek the second delimiter "
+    nPos2Deli:=at(cDelim+cSeparator,row,nPos1Deli+1)    // seek the second delimiter "
     if nPos1Deli > 0 .and. nPos2Deli > 0
         if nPosNextSep>nPos1Deli .and. nPosNextSep<nPos2Deli
            nPosSep=nPos1Deli