diff --git a/src/fsm.h b/src/fsm.h
index afa3422e..4ccf9904 100644
--- a/src/fsm.h
+++ b/src/fsm.h
@@ -402,6 +402,8 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
@@ -461,10 +463,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -518,10 +523,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -574,10 +582,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -628,10 +639,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -681,10 +695,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -733,10 +750,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -784,10 +804,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -833,10 +856,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -881,10 +907,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -928,10 +957,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -974,10 +1006,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -1018,10 +1053,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -1061,10 +1099,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -1103,10 +1144,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
@@ -1144,10 +1188,13 @@ namespace etl
     {
     }
 
+  protected:
+
     inline TContext& get_fsm_context() const
     {
       return static_cast<TContext&>(ifsm_state::get_fsm_context());
     }
+
   private:
 
     etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)
diff --git a/src/fsm_generator.h b/src/fsm_generator.h
index 203c1b77..50c67cad 100644
--- a/src/fsm_generator.h
+++ b/src/fsm_generator.h
@@ -422,6 +422,8 @@ namespace etl
   cog.outl("  {")
   cog.outl("  }")
   cog.outl("")
+  cog.outl("protected:")
+  cog.outl("")
   cog.outl("  inline TContext& get_fsm_context() const")
   cog.outl("  {")
   cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
@@ -493,10 +495,13 @@ namespace etl
       cog.outl("  {")
       cog.outl("  }")
       cog.outl("")
+      cog.outl("protected:")
+      cog.outl("")
       cog.outl("  inline TContext& get_fsm_context() const")
       cog.outl("  {")
       cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
       cog.outl("  }")
+      cog.outl("")
       cog.outl("private:")
       cog.outl("")
       cog.outl("  etl::fsm_state_id_t process_event(etl::imessage_router& source, const etl::imessage& message)")