diff --git a/include/etl/fsm.h b/include/etl/fsm.h
index 7bc2eefd..2f83fb7e 100644
--- a/include/etl/fsm.h
+++ b/include/etl/fsm.h
@@ -386,7 +386,7 @@ namespace etl
     //********************************************
     bool is_consumer() const ETL_OVERRIDE
     {
-      return false;
+      return true;
     }
 
   private:
diff --git a/include/etl/generators/fsm_generator.h b/include/etl/generators/fsm_generator.h
index 85552006..b812684d 100644
--- a/include/etl/generators/fsm_generator.h
+++ b/include/etl/generators/fsm_generator.h
@@ -398,7 +398,7 @@ namespace etl
     //********************************************
     bool is_consumer() const ETL_OVERRIDE
     {
-      return false;
+      return true;
     }
 
   private:
diff --git a/test/test_fsm.cpp b/test/test_fsm.cpp
index dd334fa3..f34ebbf3 100644
--- a/test/test_fsm.cpp
+++ b/test/test_fsm.cpp
@@ -338,6 +338,9 @@ namespace
     {
       etl::null_message_router nmr;
 
+      CHECK(motorControl.is_producer());
+      CHECK(motorControl.is_consumer());
+
       motorControl.Initialise(stateList, etl::size(stateList));
       motorControl.reset();
       motorControl.ClearStatistics();