diff --git a/DCC.cpp b/DCC.cpp
index 7d5592b0..36463d3f 100644
--- a/DCC.cpp
+++ b/DCC.cpp
@@ -567,7 +567,7 @@ void DCC::loop()  {
 
 void DCC::issueReminders() {
   // if the main track transmitter still has a pending packet, skip this time around.
-  if ( DCCWaveform::mainTrack.packetPending) return;
+  if (!DCCWaveform::mainTrack.reminderWindowOpen) return;
 
   // This loop searches for a loco in the speed table starting at nextLoco and cycling back around
   for (int reg=0;reg<MAX_LOCOS;reg++) {
diff --git a/DCCEX.h b/DCCEX.h
index 15044906..6fae3aed 100644
--- a/DCCEX.h
+++ b/DCCEX.h
@@ -38,7 +38,7 @@
 #include "LCN.h"
 #include "freeMemory.h"
 
-#if __has_include ( "myAutomation.h")
+#if __has_include ("myAutomation.h") && __has_include ("RMFT.h")
   #include "RMFT.h"
   #define RMFT_ACTIVE
 #endif
diff --git a/DCCWaveform.cpp b/DCCWaveform.cpp
index df88e5d3..33cf594e 100644
--- a/DCCWaveform.cpp
+++ b/DCCWaveform.cpp
@@ -94,6 +94,7 @@ const byte bitMask[] = {0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
 DCCWaveform::DCCWaveform( byte preambleBits, bool isMain) {
   isMainTrack = isMain;
   packetPending = false;
+  reminderWindowOpen = false;
   memcpy(transmitPacket, idlePacket, sizeof(idlePacket));
   state = WAVE_START;
   // The +1 below is to allow the preamble generator to create the stop bit
@@ -222,6 +223,10 @@ void DCCWaveform::interrupt2() {
     //end of Byte
     bits_sent = 0;
     bytes_sent++;
+    // if this is the byte before last byte, open reminder window
+    if (bytes_sent == transmitLength  && transmitRepeats == 0 && !packetPending) {
+      reminderWindowOpen = true;
+    }
     // if this is the last byte, prepere for next packet
     if (bytes_sent >= transmitLength) {
       // end of transmission buffer... repeat or switch to next message
@@ -270,6 +275,7 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
   pendingLength = byteCount + 1;
   pendingRepeats = repeats;
   packetPending = true;
+  reminderWindowOpen = false;
   sentResetsSincePacket=0;
 }
 
diff --git a/DCCWaveform.h b/DCCWaveform.h
index 29d6a29e..562f1580 100644
--- a/DCCWaveform.h
+++ b/DCCWaveform.h
@@ -82,6 +82,7 @@ class DCCWaveform {
     }
     void schedulePacket(const byte buffer[], byte byteCount, byte repeats);
     volatile bool packetPending;
+    volatile bool reminderWindowOpen;
     volatile byte sentResetsSincePacket;
     volatile bool autoPowerOff=false;
     void setAckBaseline();  //prog track only