diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index eede5f96d5..2cdfca1270 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+19991010-13:36 GMT+1 Victor Szel <info@szelvesz.hu>
+   * source/vm/hvm.c
+     ! HB_P_NOOP - Caused an infinite loop, fixed.
+     % hb_vmPlus(), hb_vmMinus() - Two returns from inside removed.
+
 19991010-13:26 GMT+1 Bruno Cantero <bruno@issnet.net>
 
    * include/rddapi.h
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 286bf1ff80..06aeaf2e74 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -959,6 +959,7 @@ void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols )
 
          case HB_P_NOOP:
             /* Intentionally do nothing */
+            w += 1;
             break;
 
          default:
@@ -1059,7 +1060,6 @@ static void hb_vmPlus( void )
             pItem2->item.asString.value = NULL;
          }
          hb_stackPop();
-         return;
       }
       else
          hb_errRT_BASE( EG_STROVERFLOW, 1209, NULL, "+" );
@@ -1160,7 +1160,6 @@ static void hb_vmMinus( void )
             pItem2->item.asString.value = NULL;
          }
          hb_stackPop();
-         return;
       }
       else
          hb_errRT_BASE( EG_STROVERFLOW, 1210, NULL, "-" );