diff --git a/hi_core/hi_modules/modulators/mods/MPEModulators.cpp b/hi_core/hi_modules/modulators/mods/MPEModulators.cpp
index 3d922d21c6..23252708ce 100644
--- a/hi_core/hi_modules/modulators/mods/MPEModulators.cpp
+++ b/hi_core/hi_modules/modulators/mods/MPEModulators.cpp
@@ -151,6 +151,7 @@ void MPEModulator::setInternalAttribute(int parameterIndex, float newValue)
 		switch (getMode())
 		{
 		case Modulation::GainMode:	defaultValue = jlimit<float>(0.0f, 1.0f, newValue); break;
+		case Modulation::GlobalMode:defaultValue = jlimit<float>(0.0f, 1.0f, newValue); break;
 		case Modulation::PitchMode: defaultValue = jlimit<float>(0.0f, 1.0f, newValue / 24.0f + 0.5f); break;
 		case Modulation::PanMode:	defaultValue = jlimit<float>(0.0f, 1.0f, newValue / 200.0f + 0.5f); break;
         default: jassertfalse; break;
diff --git a/hi_scripting/scripting/api/ScriptingApi.cpp b/hi_scripting/scripting/api/ScriptingApi.cpp
index cdcc202c37..7521fbe797 100644
--- a/hi_scripting/scripting/api/ScriptingApi.cpp
+++ b/hi_scripting/scripting/api/ScriptingApi.cpp
@@ -3867,9 +3867,10 @@ void ScriptingApi::Sampler::setActiveGroupForEventId(int eventId, int activeGrou
 		return;
 	}
 	
-	if(s->getMainController()->getKillStateHandler().getCurrentThread() != MainController::KillStateHandler::TargetThread::AudioThread)
+	if(eventId != -1 && s->getMainController()->getKillStateHandler().getCurrentThread() != MainController::KillStateHandler::TargetThread::AudioThread)
 	{
 		reportScriptError("This method is only available in the onNoteOnCallback");
+		return;
 	}
 
 	bool ok = s->setCurrentGroupIndex(activeGroupIndex, eventId);