diff --git a/RTCP/Interface/include/Interface/OutputTypes.h b/RTCP/Interface/include/Interface/OutputTypes.h
index 808029bfa4a4210c2804a051b0e1cc7a2c92c79b..3f0f8f1ad92ddb23391ed1199974b6df2e12ab69 100644
--- a/RTCP/Interface/include/Interface/OutputTypes.h
+++ b/RTCP/Interface/include/Interface/OutputTypes.h
@@ -8,13 +8,13 @@ enum OutputType
 {
   CORRELATED_DATA = 1,
   BEAM_FORMED_DATA,
-  TRIGGER_DATA
-};
-
-
-const OutputType FIRST_OUTPUT_TYPE = static_cast<OutputType>(1);
-const OutputType LAST_OUTPUT_TYPE  = static_cast<OutputType>(4); // exclusive
+  TRIGGER_DATA,
 
+  // define LAST and FIRST in the enum to make them valid values within the
+  // allocated range for the enum (=minimal number of bits to store all values)
+  LAST_OUTPUT_TYPE,
+  FIRST_OUTPUT_TYPE = 1
+};
 
 inline OutputType operator ++ (OutputType &outputType) // prefix ++
 {