diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4aa723084a..c272a026bf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-27 03:08 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/tbrowse.prg
+    ! fixed cursor positioning when it's moved faster then record
+      buffer refreshed. It should also fix flickering problem reported
+      by Viktor - please test.
+
 2008-05-26 16:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    * common.mak
    * source/hbpcre/Makefile
diff --git a/harbour/source/rtl/tbrowse.prg b/harbour/source/rtl/tbrowse.prg
index aa9f00124a..91d8dddeaf 100644
--- a/harbour/source/rtl/tbrowse.prg
+++ b/harbour/source/rtl/tbrowse.prg
@@ -691,11 +691,11 @@ METHOD setPosition() CLASS TBROWSE
 
    IF nNewPos < 1
       IF ::nMoveOffset < -1
-         nMoveOffset -= ::nBufferPos - 1
+         nMoveOffset -= ::nRowPos - 1
       ENDIF
    ELSEIF nNewPos > ::nLastRow
       IF ::nMoveOffset > 1
-         nMoveOffset += ::nLastRow - ::nBufferPos
+         nMoveOffset += ::nLastRow - ::nRowPos
       ENDIF
    ELSEIF lSetPos
       ::nRowPos := nNewPos