diff --git a/includes/sensor_threshold.c b/includes/sensor_threshold.c
index fda3e51..dd53fa0 100644
--- a/includes/sensor_threshold.c
+++ b/includes/sensor_threshold.c
@@ -36,7 +36,7 @@
   sensor_integer_threshold_set_upper_warning(sen,uw);
   sensor_integer_threshold_set_upper_critical(sen,uc);
   sensor_integer_threshold_complete_set(sen,invocation);
-  sensor_integer_threshold_set_state(sen,NORMAL);
+  //sensor_integer_threshold_set_state(sen,NORMAL);
   return TRUE;
 }
 
@@ -66,12 +66,14 @@
 			if (state == LOWER_CRITICAL || state == UPPER_CRITICAL)
 			{
 				sensor_integer_threshold_emit_critical(sensor);
-				g_print("Critical\n");
 			}
  			else if (state == LOWER_WARNING || state == UPPER_WARNING)
 			{
  				sensor_integer_threshold_emit_warning(sensor);
-				g_print("Warning\n");
+			}
+			else if (state == NORMAL)
+			{
+				sensor_integer_threshold_emit_normal(sensor);
 			}
 		}
 	//}
diff --git a/includes/sensor_threshold.h b/includes/sensor_threshold.h
index 3d35067..e955266 100644
--- a/includes/sensor_threshold.h
+++ b/includes/sensor_threshold.h
@@ -2,7 +2,7 @@
 #define __SENSOR_THRESHOLDS_H__
 
 #include <stdint.h>
-#include "interfaces/sensor2.h"
+#include "interfaces/sensor.h"
 
 typedef enum { NOT_SET,NORMAL,LOWER_CRITICAL,LOWER_WARNING,UPPER_WARNING,UPPER_CRITICAL } threshold_states;