diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 410614c8bb..b694f6ca91 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2003-07-03 11:46 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
+  * source/rdd/dbfntx/dbfntx1.c
+    ! Bug fixed, which appeared after switching between orders and following skipping.
+
 2003-07-03 10:54 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   + source/codepage/cdpsl437.c
   + source/lang/msgsl437.c
diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c
index ec1030524a..1d880823c1 100644
--- a/harbour/source/rdd/dbfntx/dbfntx1.c
+++ b/harbour/source/rdd/dbfntx/dbfntx1.c
@@ -841,7 +841,7 @@ static BOOL hb_ntxTagGoToNextKey( LPTAGINFO pTag, BOOL lContinue )
    LPNTXITEM p;
 
    // pTag->blockNext = 0; pTag->keyNext = 0;
-   if( pTag->CurKeyInfo->Tag )
+   if( pTag->CurKeyInfo->Tag && ((ULONG)pTag->CurKeyInfo->Xtra) == pTag->Owner->Owner->ulRecNo )
    {
       pPage =  hb_ntxPageLoad( pTag,pTag->CurKeyInfo->Tag );
       pPage->CurKey =  hb_ntxPageFindCurrentKey( pPage,pTag->CurKeyInfo->Xtra );
@@ -941,7 +941,7 @@ static BOOL hb_ntxTagGoToPrevKey( LPTAGINFO pTag, BOOL lContinue )
    LPPAGEINFO pPage, pChildPage;
 
    // pTag->blockPrev = 0; pTag->keyPrev = 0;
-   if( pTag->CurKeyInfo->Tag )
+   if( pTag->CurKeyInfo->Tag && ((ULONG)pTag->CurKeyInfo->Xtra) == pTag->Owner->Owner->ulRecNo )
    {
       pPage =  hb_ntxPageLoad( pTag,pTag->CurKeyInfo->Tag );
       pPage->CurKey =  hb_ntxPageFindCurrentKey( pPage,pTag->CurKeyInfo->Xtra );