diff --git a/MicroDexed.ino b/MicroDexed.ino
index 7a183ea..4cd0f88 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -2228,6 +2228,8 @@ void show_cpu_and_mem_usage(void)
   Serial.print(AudioMemoryUsage(), DEC);
   Serial.print(F("|MEMMAX:"));
   Serial.print(AudioMemoryUsageMax(), DEC);
+  Serial.print(F("|AUDIO_MEM_MAX:"));
+  Serial.print(AUDIO_MEM, DEC);
   Serial.print(F("|RENDERTIMEMAX:"));
   Serial.print(sum_render_time_max, DEC);
   Serial.print(F("|XRUN:"));
diff --git a/config.h b/config.h
index 4dd021e..078950e 100644
--- a/config.h
+++ b/config.h
@@ -32,7 +32,7 @@
 
 // ATTENTION! For better latency you have to redefine AUDIO_BLOCK_SAMPLES from
 // 128 to 64 in <ARDUINO-IDE-DIR>/cores/teensy3/AudioStream.h
-// For this you haveto DOUBLE the audio buffers (AUDIO_MEM) manually!
+// For this audio buffers (AUDIO_MEM) are doubled!
 
 // If you want to test the system with Linux and without any keyboard and/or audio equipment, you can do the following:
 // 1. In Arduino-IDE enable "Tools->USB-Type->Serial + MIDI + Audio"
@@ -128,7 +128,11 @@
 //* AUDIO SOFTWARE SETTINGS
 //*************************************************************************************************
 #define SAMPLE_RATE 44100
+#if AUDIO_BLOCK_SAMPLES == 64
+#define AUDIO_MEM 64
+#else
 #define AUDIO_MEM 32
+#endif
 
 #ifdef TEENSY_AUDIO_BOARD
 /*