Index: generic/nsf.c
===================================================================
diff -u -r350395592496276bc98362b9dadb03f663e25f0b -r2cd96f38dddd3c2c2a3ab71abf68ac7f5ad7d879
--- generic/nsf.c	(.../nsf.c)	(revision 350395592496276bc98362b9dadb03f663e25f0b)
+++ generic/nsf.c	(.../nsf.c)	(revision 2cd96f38dddd3c2c2a3ab71abf68ac7f5ad7d879)
@@ -11988,11 +11988,11 @@
                 o++; p++;
                 if (nppPtr->flags & NSF_ARG_REQUIRED) nrReq++; else nrOpt++;
 
-                if (o < objc) {
+                if (p < objc) {
 #if defined(PARSE_TRACE_FULL)
 		  fprintf(stderr, "...     setting cd[%d] '%s' = %s (%d) %s converter %p\n",
                           i, nppPtr->name, ObjStr(objv[p]), nppPtr->nrArgs,
-                          nppPtr->flags & NSF_ARG_REQUIRED ? "req":"not req", nppPtr->converter);
+                          nppPtr->flags & NSF_ARG_REQUIRED ? "req" : "not req", nppPtr->converter);
 #endif
                   if (ArgumentCheck(interp, objv[p], nppPtr, doCheck,
 				    &pcPtr->flags[j], &pcPtr->clientData[j], &pcPtr->objv[j]) != TCL_OK) {
@@ -15336,8 +15336,8 @@
     }
 
     newValue = pc.full_objv[i];
-    /*fprintf(stderr, "new Value of %s = %p '%s', type %s\n",
-            ObjStr(paramPtr->nameObj),
+    /*fprintf(stderr, "new Value of %s = [%d] %p '%s', type %s\n",
+            ObjStr(paramPtr->nameObj), i,
             newValue, newValue ? ObjStr(newValue) : "(null)", paramPtr->type); */
 
     if (newValue == NsfGlobalObjs[NSF___UNKNOWN__]) {