diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7fcec3673f..16460351b2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+      passing to ORDCREATE()
+
+  * harbour/source/vm/fm.c
+    ! fixed typo in memset() when HB_PARANOID_MEM_CHECK enabled
+
        - Preprocessor (PP) lib flavour is not affected by this setting.
        - Support is not full in the RDD code yet.
 
diff --git a/harbour/source/rtl/cdpapi.c b/harbour/source/rtl/cdpapi.c
index 0bbbd2c831..bd93504f5e 100644
--- a/harbour/source/rtl/cdpapi.c
+++ b/harbour/source/rtl/cdpapi.c
@@ -711,6 +711,10 @@ HB_EXPORT int hb_cdpcmp( char* szFirst, char* szSecond, ULONG ulLen, PHB_CODEPAG
             /* printf( "\n|%c|%c|%d %d %d",*szFirst,*szSecond,((int)*szFirst)&255,((int)*szSecond)&255,iRet ); */
             break;
          }
+         if( n1 == n2 )
+         {
+            continue;
+         }
          if( cdpage->nMulti && ul )
          {
             int j, nd1 = 0, nd2 = 0;