diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c05a687385..fef64aa8db 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,10 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+     ! reverted changes to hb_dbfGoTo
+   * source/rdd/dbfcdx/dbfcdx1.c
+     ! fixed bug with bof flag
+
 2002-02-04 22:20 UTC-0300 Luiz Rafael Culik <culik@sl.conex.net
    * utils/hbmake/hbmake.prg
      * Minor fix
diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c
index 346f75de83..12c9af68e4 100644
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -1136,14 +1136,15 @@ HB_FUNC( DBCOMMIT )
 
 HB_FUNC( DBCOMMITALL )
 {
-   LPAREANODE pAreaNode;
+   LPAREANODE pAreaNode = s_pCurrArea;
 
-   pAreaNode = s_pWorkAreas;
-   while( pAreaNode )
+   s_pCurrArea = s_pWorkAreas;
+   while( s_pCurrArea )
    {
-      SELF_FLUSH( ( AREAP ) pAreaNode->pArea );
-      pAreaNode = pAreaNode->pNext;
+      SELF_FLUSH( ( AREAP ) s_pCurrArea->pArea );
+      s_pCurrArea = s_pCurrArea->pNext;
    }
+   s_pCurrArea = pAreaNode;
 }
 
 HB_FUNC( __DBCONTINUE )
@@ -1862,14 +1863,15 @@ HB_FUNC( DBUNLOCK )
 
 HB_FUNC( DBUNLOCKALL )
 {
-   LPAREANODE pTempArea;
+   LPAREANODE pTempArea = s_pCurrArea;
 
-   pTempArea = s_pWorkAreas;
-   while( pTempArea )
+   s_pCurrArea = s_pWorkAreas;
+   while( s_pCurrArea )
    {
-      SELF_UNLOCK( ( AREAP ) pTempArea->pArea, 0 );
-      pTempArea = pTempArea->pNext;
+      SELF_UNLOCK( ( AREAP ) s_pCurrArea->pArea, 0 );
+      s_pCurrArea = s_pCurrArea->pNext;
    }
+   s_pCurrArea = pTempArea;
 }
 
 HB_FUNC( DBUSEAREA )