diff --git a/Modules/juce_organicui b/Modules/juce_organicui
index 2916c10be..e9d676064 160000
--- a/Modules/juce_organicui
+++ b/Modules/juce_organicui
@@ -1 +1 @@
-Subproject commit 2916c10be621485b198c06c8d84804593e06ed16
+Subproject commit e9d67606423dad374c890add1e0d7699ca233fe6
diff --git a/Modules/juce_timeline b/Modules/juce_timeline
index e2f20ef8e..adfafa182 160000
--- a/Modules/juce_timeline
+++ b/Modules/juce_timeline
@@ -1 +1 @@
-Subproject commit e2f20ef8ebcb34f8122ab9da29aae838ee1bb7a3
+Subproject commit adfafa182ef7f394b2035d40bd8b6f3235210815
diff --git a/Source/Common/Processor/Mapping/Input/MappingInput.cpp b/Source/Common/Processor/Mapping/Input/MappingInput.cpp
index d2fa40bf8..5f2144334 100644
--- a/Source/Common/Processor/Mapping/Input/MappingInput.cpp
+++ b/Source/Common/Processor/Mapping/Input/MappingInput.cpp
@@ -113,13 +113,13 @@ StandardMappingInput::StandardMappingInput(var params, Multiplex* processor) :
 
 StandardMappingInput::~StandardMappingInput()
 {
-	if (list != nullptr) list->removeMultiplexListListener(this);
+	if (list != nullptr && !list->isClearing) list->removeMultiplexListListener(this);
 }
 
 void StandardMappingInput::lockInput(Parameter* input)
 {
 	setInput(input);
-	if (input != nullptr) inputTarget->setEnabled(false);
+	if (input != nullptr && !list->isClearing) inputTarget->setEnabled(false);
 }
 
 
@@ -127,14 +127,14 @@ void StandardMappingInput::setList(BaseMultiplexList* newList)
 {
 	if (newList == list) return;
 
-	if (list != nullptr)
+	if (list != nullptr && !list->isClearing)
 	{
 		list->removeMultiplexListListener(this);
 	}
 
 	list = newList;
 
-	if (list != nullptr)
+	if (list != nullptr && !list->isClearing)
 	{
 		list->addMultiplexListListener(this);
 	}
@@ -146,7 +146,7 @@ void StandardMappingInput::setList(BaseMultiplexList* newList)
 Parameter* StandardMappingInput::getInputAt(int multiplexIndex)
 {
 	if (!multiplexListMode) return MappingInput::getInputAt(multiplexIndex);
-	return dynamic_cast<Parameter*>(list != nullptr ? list->getTargetControllableAt(multiplexIndex) : nullptr);
+	return dynamic_cast<Parameter*>(list != nullptr && !list->isClearing ? list->getTargetControllableAt(multiplexIndex) : nullptr);
 }