diff --git a/distrho/src/DistrhoPluginVST.hpp b/distrho/src/DistrhoPluginVST.hpp
index 2d488ca7..461a7ec5 100644
--- a/distrho/src/DistrhoPluginVST.hpp
+++ b/distrho/src/DistrhoPluginVST.hpp
@@ -70,8 +70,7 @@ enum Vst3InternalParameters {
     kVst3InternalParameterBaseCount,
    #if DISTRHO_PLUGIN_WANT_MIDI_INPUT
     kVst3InternalParameterMidiCC_start = kVst3InternalParameterBaseCount,
-    kVst3InternalParameterMidiCC_end = kVst3InternalParameterMidiCC_start + 130*16,
-    kVst3InternalParameterCount
+    kVst3InternalParameterCount = kVst3InternalParameterMidiCC_start + 130 * 16
    #else
     kVst3InternalParameterCount = kVst3InternalParameterBaseCount
    #endif
diff --git a/distrho/src/DistrhoPluginVST3.cpp b/distrho/src/DistrhoPluginVST3.cpp
index d26ba758..cb743923 100644
--- a/distrho/src/DistrhoPluginVST3.cpp
+++ b/distrho/src/DistrhoPluginVST3.cpp
@@ -1573,7 +1573,7 @@ class PluginVst3
                 {
                    #if DISTRHO_PLUGIN_WANT_MIDI_INPUT
                     // if there are any MIDI CC events as parameter changes, handle them here
-                    if (canAppendMoreEvents && rindex >= kVst3InternalParameterMidiCC_start && rindex <= kVst3InternalParameterMidiCC_end)
+                    if (canAppendMoreEvents && rindex >= kVst3InternalParameterMidiCC_start && rindex < kVst3InternalParameterCount)
                     {
                         for (int32_t j = 0, pcount = v3_cpp_obj(queue)->get_point_count(queue); j < pcount; ++j)
                         {
@@ -2008,7 +2008,7 @@ class PluginVst3
            #if !DPF_VST3_PURE_MIDI_INTERNAL_PARAMETERS
             rindex >= kVst3InternalParameterMidiCC_start &&
            #endif
-            rindex <= kVst3InternalParameterMidiCC_end)
+            rindex < kVst3InternalParameterCount)
             return 0.0;
        #endif
 
@@ -2045,7 +2045,7 @@ class PluginVst3
            #if !DPF_VST3_PURE_MIDI_INTERNAL_PARAMETERS
             rindex >= kVst3InternalParameterMidiCC_start &&
            #endif
-            rindex <= kVst3InternalParameterMidiCC_end)
+            rindex < kVst3InternalParameterCount)
             return V3_INVALID_ARG;
        #endif