diff --git a/upnp/src/api/upnptools.c b/upnp/src/api/upnptools.c
index 46329f3..9cb220e 100644
--- a/upnp/src/api/upnptools.c
+++ b/upnp/src/api/upnptools.c
@@ -298,7 +298,7 @@ makeAction( IN int response,
     if( NumArg > 0 ) {
         //va_start(ArgList, Arg);
         ArgName = Arg;
-        while( Idx++ != NumArg ) {
+        for(;;;) {
             ArgValue = va_arg( ArgList, const char * );
 
             if( ArgName != NULL ) {
@@ -313,6 +313,10 @@ makeAction( IN int response,
                 ixmlNode_appendChild( node, ( IXML_Node * ) Ele );
             }
 
+            if ( ++Idx == NumArg ) {
+                break;
+            }
+
             ArgName = va_arg( ArgList, const char * );
         }
         //va_end(ArgList);