diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bfd91b3404..0de40d4e6b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-17 21:45 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
+
+    *source/vm.estack.c
+        *fixed initialization of items during the stack reallocation
+        *STACK_* constants can be defined using a compiler
+        command line
+
 2001-01-16 22:15 GMT+1 JFL (Mafact) <jfl@mafact.com>
     *harbour/makefile.vc
     *harbour/source/compiler/genobj32.c
diff --git a/harbour/source/vm/estack.c b/harbour/source/vm/estack.c
index 1f3c46ebce..44683172d7 100644
--- a/harbour/source/vm/estack.c
+++ b/harbour/source/vm/estack.c
@@ -39,8 +39,12 @@
 #include "hbapierr.h"
 
 /* ------------------------------- */
-#define STACK_INITHB_ITEMS      2000
-#define STACK_EXPANDHB_ITEMS    200
+#if !defined( STACK_INITHB_ITEMS )
+#define STACK_INITHB_ITEMS      200
+#endif
+#if !defined( STACK_EXPANDHB_ITEMS )
+#define STACK_EXPANDHB_ITEMS    20
+#endif
 
 HB_STACK hb_stack;
 /* ------------------------------- */
@@ -103,7 +107,7 @@ void hb_stackPush( void )
       hb_stack.pPos = hb_stack.pItems + CurrIndex;
       hb_stack.pBase = hb_stack.pItems + BaseIndex;
       hb_stack.wItems += STACK_EXPANDHB_ITEMS;
-      for( i=CurrIndex; i < hb_stack.wItems; ++i )
+      for( i=CurrIndex + 1; i < hb_stack.wItems; ++i )
          hb_stack.pItems[ i ] = (HB_ITEM *) hb_xgrab( sizeof( HB_ITEM ) );
       /* hb_stackDispLocal(); */
    }