Index: trunk/modules/CheckSystem/CheckSystem.cpp
===================================================================
--- trunk/modules/CheckSystem/CheckSystem.cpp	(revision 7da80b56f4754fe3b43eafda60615fd44d4dd698)
+++ trunk/modules/CheckSystem/CheckSystem.cpp	(revision e93e741d52879c3f82f378b69ab3214438b0f502)
@@ -593,5 +593,5 @@
 		try {
 			PDH::PDHQuery pdh;
-			PDHCollectors::StaticPDHCounterListenerInt counter;
+			PDHCollectors::StaticPDHCounterListener<double, PDH_FMT_DOUBLE> counter;
 			std::string name = (*it).first;
 			if (name.empty())
@@ -601,5 +601,4 @@
 			pdh.collect();
 			if (bNSCLientCompatible) {
-//				std::cout << counter.getValue() << std::endl;
 				msg += strEx::itos(counter.getValue());
 			} else {
@@ -632,5 +631,5 @@
 	if (msg.empty())
 		msg = "OK all counters within bounds.";
-	else
+	else if (!bNSCLientCompatible)
 		msg = NSCHelper::translateReturn(returnCode) + ": " + msg;
 	return returnCode;
Index: trunk/modules/CheckSystem/PDHCollector.cpp
===================================================================
--- trunk/modules/CheckSystem/PDHCollector.cpp	(revision 7da80b56f4754fe3b43eafda60615fd44d4dd698)
+++ trunk/modules/CheckSystem/PDHCollector.cpp	(revision e93e741d52879c3f82f378b69ab3214438b0f502)
@@ -50,4 +50,9 @@
 */
 DWORD PDHCollector::threadProc(LPVOID lpParameter) {
+	hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
+	if (!hStopEvent_) {
+		NSC_LOG_ERROR_STD("Create StopEvent failed: " + strEx::itos(GetLastError()));
+		return 0;
+	}
 	PDH::PDHQuery pdh;
 	pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE_LIMIT, C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT), &memCmtLim);
@@ -63,9 +68,4 @@
 	}
 
-	hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
-	if (!hStopEvent_) {
-		NSC_LOG_ERROR_STD("Create StopEvent failed: " + strEx::itos(GetLastError()));
-		return 0;
-	}
 
 	do {
Index: trunk/modules/CheckSystem/PDHCollector.h
===================================================================
--- trunk/modules/CheckSystem/PDHCollector.h	(revision 7da80b56f4754fe3b43eafda60615fd44d4dd698)
+++ trunk/modules/CheckSystem/PDHCollector.h	(revision e93e741d52879c3f82f378b69ab3214438b0f502)
@@ -30,8 +30,8 @@
 	int checkIntervall_;
 
-	PDHCollectors::StaticPDHCounterListenerInt memCmtLim;
-	PDHCollectors::StaticPDHCounterListenerInt memCmt;
-	PDHCollectors::StaticPDHCounterListenerInt upTime;
-	PDHCollectors::RoundINTPDHBufferListener cpu;
+	PDHCollectors::StaticPDHCounterListener<__int64, PDH_FMT_LARGE> memCmtLim;
+	PDHCollectors::StaticPDHCounterListener<__int64, PDH_FMT_LARGE> memCmt;
+	PDHCollectors::StaticPDHCounterListener<__int64, PDH_FMT_LARGE> upTime;
+	PDHCollectors::RoundINTPDHBufferListener<__int64, PDH_FMT_LARGE> cpu;
 
 public: