diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index 8a96588b02..757de40cbf 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-29 Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* bin/PandoraAgent.exe: Compiled new exe with a bug fixed.
+	* pandora_windows_service.cc: Fixed a bug related to proxy mode.
+
 2011-07-28 Dario Rodriguez <dario.rodriguez@artica.es>
 	
 	* pandora_windows_service.h, pandora_windows_service.cc: Added proxy
diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe
index f0c6afbc08..9223a6f33b 100755
Binary files a/pandora_agents/win32/bin/PandoraAgent.exe and b/pandora_agents/win32/bin/PandoraAgent.exe differ
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 78165f3a56..32c2d1fd86 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -336,17 +336,17 @@ Pandora_Windows_Service::lauchTentacleProxy() {
 			server_port = "41121";
 		}
 			
-		proxy_cmd = "tentacle_server.exe -b " + server_ip + " -g " + server_port + " -c " + proxy_max_connections + " -t " + proxy_timeout + "-d";		
-
-		pandoraLog("Proxy mode enabled");
+		proxy_cmd = "tentacle_server.exe -b " + server_ip + " -g " + server_port + " -c " + proxy_max_connections + " -t " + proxy_timeout;		
 		
 		ZeroMemory (&si, sizeof (si));
 		ZeroMemory (&pi, sizeof (pi));
 		if (CreateProcess (NULL , (CHAR *)proxy_cmd.c_str (), NULL, NULL, FALSE,
 			CREATE_NO_WINDOW, NULL, NULL, &si, &pi) == 0) {
+			pandoraLog("There was a problem lauching Tentacle Proxy");
 			return -1;
 		}
-				
+		
+		pandoraLog("Proxy mode enabled");				
 	} else {
 		pandoraLog ("[error] You can not proxy to localhost");
 	}