diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
index b4e5df1..5edc2df 100644
--- a/Source/PluginProcessor.cpp
+++ b/Source/PluginProcessor.cpp
@@ -784,15 +784,17 @@ void PaulstretchpluginAudioProcessor::processBlock (AudioSampleBuffer& buffer, M
 	{
 		if (midi_it.getNextEvent(midi_msg, midi_msg_pos) == false)
 			break;
-		if (midi_msg.isNoteOn())
+		if (midi_msg.isNoteOff() && midi_msg.getNoteNumber()==m_midinote_to_use)
 		{
-			m_midinote_to_use = midi_msg.getNoteNumber();
+			m_midinote_to_use = -1;
 			break;
 		}
-		if (midi_msg.isNoteOff())
+		if (midi_msg.isNoteOn())
 		{
-			m_midinote_to_use = -1;
+			m_midinote_to_use = midi_msg.getNoteNumber();
+			break;
 		}
+		
 	}
 	if (m_midinote_to_use >= 0)
 	{