diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
index 2788539..4b31b0e 100644
--- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp
+++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 78 translations.
  * @details
- * Generated on: 2021-06-21 12:56:37
+ * Generated on: 2021-06-21 16:09:15
  */
 #include "translateEvents.h"
 
diff --git a/generators/bsp_hosted_events.csv b/generators/bsp_hosted_events.csv
index c2b059f..c49b0ab 100644
--- a/generators/bsp_hosted_events.csv
+++ b/generators/bsp_hosted_events.csv
@@ -25,7 +25,7 @@
 2806;DEVICE_UNKNOWN_REPLY;LOW;;../../fsfw/devicehandlers/DeviceHandlerIF.h
 2807;DEVICE_UNREQUESTED_REPLY;LOW;;../../fsfw/devicehandlers/DeviceHandlerIF.h
 2808;INVALID_DEVICE_COMMAND;LOW;Indicates a SW bug in child class.;../../fsfw/devicehandlers/DeviceHandlerIF.h
-2809;MONITORING_LIMIT_EXCEEDED;LOW;Indicates a SW bug in child class.static const Event INVALID_DEVICE_COMMAND = MAKE_EVENT(8, severity::LOW);;../../fsfw/devicehandlers/DeviceHandlerIF.h
+2809;MONITORING_LIMIT_EXCEEDED;LOW;;../../fsfw/devicehandlers/DeviceHandlerIF.h
 2810;MONITORING_AMBIGUOUS;HIGH;;../../fsfw/devicehandlers/DeviceHandlerIF.h
 4201;FUSE_CURRENT_HIGH;LOW;;../../fsfw/power/Fuse.h
 4202;FUSE_WENT_OFF;LOW;;../../fsfw/power/Fuse.h
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index 2788539..4b31b0e 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 78 translations.
  * @details
- * Generated on: 2021-06-21 12:56:37
+ * Generated on: 2021-06-21 16:09:15
  */
 #include "translateEvents.h"
 
diff --git a/generators/fsfwgen b/generators/fsfwgen
index f81c144..e6f5ff1 160000
--- a/generators/fsfwgen
+++ b/generators/fsfwgen
@@ -1 +1 @@
-Subproject commit f81c144252995f84bf433f92d6e489f82ab0fed9
+Subproject commit e6f5ff18129984b591a6a286968b1ace42c278b2