diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index 094c492d9f..5bb1689bef 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-18  Ramon Novoa  <rnovoa@artica.es>
+
+	* windows/pandora_wmi.cc: Fixed bug #2907481.
+
+	* bin/PandoraAgent.exe: Updated to current revision.
+	
+	* installer/pandora.mpi, pandora.cc: Updated build.
+
 2009-12-16  Raul Mateos  <raulofpandora@gmail.com>
 
 	* installer/pandora.mpi, README:Preparing release
diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe
index 1ecbbffa9f..035098ab0f 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/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 8cb07d5578..834aa6dbb2 100755
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{091125}
+{091218}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 3be92914c5..414f8a2ff9 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("3.0(Build 091125)")
+#define PANDORA_VERSION ("3.0(Build 091218)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/windows/pandora_wmi.cc b/pandora_agents/win32/windows/pandora_wmi.cc
index fc27f1d81a..75ae7315b0 100644
--- a/pandora_agents/win32/windows/pandora_wmi.cc
+++ b/pandora_agents/win32/windows/pandora_wmi.cc
@@ -255,9 +255,11 @@ Pandora_Wmi::getCpuUsagePercentage (int cpu_id) {
 		FOR_EACH (quickfix, quickfixes, NULL) {
 			dhGetValue (L"%d", &load_percentage, quickfix,
 				    L".LoadPercentage");
-
-			total_cpus++;
-			total_load += load_percentage;
+			// Sanity check
+			if (load_percentage >= 0 && load_percentage <= 100) {
+				total_cpus++;
+				total_load += load_percentage;
+			}
 		} NEXT_THROW (quickfix);
 
 		if (total_cpus == 0) {