diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c41e2ef503..b96155b3c8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-29 13:09 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/rdd/dbfcdx/dbfcdx1.c
+    ! fixed possible unreleased lock after last modification in SIXCDX -
+      many thanks to Mindaugas for the information
+
 2010-01-28 18:03 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/filelist.mk
   + contrib/hbqt/THbpQtUI.prg
diff --git a/harbour/src/rdd/dbfcdx/dbfcdx1.c b/harbour/src/rdd/dbfcdx/dbfcdx1.c
index 5e0db8b62a..6155cdfaf8 100644
--- a/harbour/src/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/src/rdd/dbfcdx/dbfcdx1.c
@@ -8434,9 +8434,9 @@ static HB_ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO
                   if( pKey )
                   {
                      fResult = hb_cdxTagKeyAdd( pTag, pKey );
-                     hb_cdxIndexUnLockWrite( pTag->pIndex );
                      hb_cdxKeyFree( pKey );
                   }
+                  hb_cdxIndexUnLockWrite( pTag->pIndex );
                }
             }
 #if !defined( HB_SIXCDX )
@@ -8493,9 +8493,9 @@ static HB_ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO
                   if( pKey )
                   {
                      fResult = hb_cdxTagKeyDel( pTag, pKey );
-                     hb_cdxIndexUnLockWrite( pTag->pIndex );
                      hb_cdxKeyFree( pKey );
                   }
+                  hb_cdxIndexUnLockWrite( pTag->pIndex );
                }
             }
 #if !defined( HB_SIXCDX )