diff --git a/src/cpm.c b/src/cpm.c
index 0645560..2eea5c5 100644
--- a/src/cpm.c
+++ b/src/cpm.c
@@ -356,7 +356,7 @@ void parse_can_data_tm(u_int32_t u32_can_id, int i32_can_len, u_int8_t* au8_can_
 
 
 void parse_input(u_int8_t* u8_input_buffer, int i32_len) {
-  static enum state_t s_state = IDLE;
+  enum state_t s_state = IDLE;
   u_int8_t u8_input = 0;
   int i32_i;
 
diff --git a/src/facilities.c b/src/facilities.c
index b668cbd..54a9a15 100644
--- a/src/facilities.c
+++ b/src/facilities.c
@@ -667,8 +667,7 @@ int main() {
     pthread_create(&facilities.infrastructure_service, NULL, infrastructure_service, (void*) &facilities);
 
     // CPM 
-    if(facilities.dissemination->active)
-        pthread_create(&facilities.cp_service, NULL, cp_service, (void*) &facilities);
+    pthread_create(&facilities.cp_service, NULL, cp_service, (void*) &facilities);
 
     // SA
     pthread_create(&facilities.sa_service, NULL, sa_service, (void*) &facilities);
@@ -762,8 +761,7 @@ int main() {
     pthread_join(facilities.ca_service, NULL);
     pthread_join(facilities.den_service, NULL);
     pthread_join(facilities.infrastructure_service, NULL);
-    if(facilities.dissemination->active)
-        pthread_join(facilities.cp_service, NULL);
+    pthread_join(facilities.cp_service, NULL);
 
     return 0;
 }