diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index 1bf2691408..df7a690c07 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-25  Ramon Novoa  <rnovoa@artica.es>
+
+	* windows/pandora_wmi.cc: When concatenating IP addresses, do not
+	  output a comma unless the IP can be parsed.
+
 2013-06-20  Ramon Novoa  <rnovoa@artica.es>
 
 	* windows/winevt.h: Added to repository. Headers for Wevtapi.dll.
diff --git a/pandora_agents/win32/windows/pandora_wmi.cc b/pandora_agents/win32/windows/pandora_wmi.cc
index cf0f3f53dd..adfb77cc02 100644
--- a/pandora_agents/win32/windows/pandora_wmi.cc
+++ b/pandora_agents/win32/windows/pandora_wmi.cc
@@ -935,10 +935,10 @@ getIPs(VARIANT *ip_array){
        }
        int num_ips  = V_ARRAY(ip_array)->rgsabound[0].cElements;
        for (i = 0;i < num_ips;i++) { 
-	   	   if (i > 0) {
-		   	  	 ret += " , ";
-	   	   }
            if (V_VT(&pvArray[i]) == VT_BSTR) { 
+	   	     if (i > 0) {
+		   	   ret += " , ";
+	   	     }
              LPSTR szStringA;                     
              ret +=  Pandora_Strutils::strUnicodeToAnsi( V_BSTR(&pvArray[i]));             
            }