diff --git a/src/AudioEffectAnalogDelay.cpp b/src/AudioEffectAnalogDelay.cpp
index 73d9b6a..dd216d6 100644
--- a/src/AudioEffectAnalogDelay.cpp
+++ b/src/AudioEffectAnalogDelay.cpp
@@ -171,16 +171,17 @@ void AudioEffectAnalogDelay::processMidi(int channel, int control, int value)
 	if ((m_midiConfig[MIDI_DELAY][MIDI_CHANNEL] == channel) &&
         (m_midiConfig[MIDI_DELAY][MIDI_CONTROL] == control)) {
 		// Delay
-		Serial.println(String("AudioEffectAnalogDelay::delay: ") + val);
-		delay((size_t)(val * m_maxDelaySamples));
+		m_maxDelaySamples = m_memory->getSlot()->size();
+		Serial.println(String("AudioEffectAnalogDelay::delay: ") + val + String(" out of ") + m_maxDelaySamples);
+		delay((size_t)(val * (float)m_maxDelaySamples));
 		return;
 	}
 
 	if ((m_midiConfig[MIDI_ENABLE][MIDI_CHANNEL] == channel) &&
         (m_midiConfig[MIDI_ENABLE][MIDI_CONTROL] == control)) {
 		// Enable
-		if (val >= 65) { enable(); Serial.println(String("AudioEffectAnalogDelay::enable: ON") + value); }
-		else { disable(); Serial.println(String("AudioEffectAnalogDelay::enable: OFF") + value); }
+		if (value >= 65) { enable(); Serial.println(String("AudioEffectAnalogDelay::enable: ON")); }
+		else { disable(); Serial.println(String("AudioEffectAnalogDelay::enable: OFF")); }
 		return;
 	}