diff --git a/Projects/XPLAINBridge/Lib/SoftUART.c b/Projects/XPLAINBridge/Lib/SoftUART.c
index 458a505cd2f84f96015ff45fbc0d6f937005e839..90c23b71d4ebb61e0b6e7a8d8f5252cc34c3df61 100644
--- a/Projects/XPLAINBridge/Lib/SoftUART.c
+++ b/Projects/XPLAINBridge/Lib/SoftUART.c
@@ -76,15 +76,21 @@ void SoftUART_Init(void)
 /** ISR to detect the start of a bit being sent to the software UART. */
 ISR(INT0_vect, ISR_BLOCK)
 {
-	/* Reset and start the reception timer */
-	TCNT1  = 0;
-	TCCR1B = ((1 << CS10) | (1 << WGM12));
-
 	/* Reset the number of reception bits remaining counter */
 	RX_BitsRemaining = 8;
+	
+	/* Reset the bit reception timer */
+	TCNT1 = 0;
+
+	/* Check to see that the pin is still low (prevents glitches from starting a frame reception) */
+	if (!(SRXPIN & (1 << SRX)))
+	{
+		/* Disable start bit detection ISR while the next byte is received */
+		EIMSK = 0;
 
-	/* Disable start bit detection ISR while the next byte is received */
-	EIMSK = 0;
+		/* Start the reception timer */
+		TCCR1B = ((1 << CS10) | (1 << WGM12));
+	}
 }
 
 /** ISR to manage the reception of bits to the software UART. */
@@ -133,7 +139,7 @@ ISR(TIMER3_COMPA_vect, ISR_NOBLOCK)
 		TX_Data >>= 1;
 		TX_BitsRemaining--;
 	}
-	else if (USBtoUART_Buffer.Count)
+	else if (USBtoUART_Buffer.Count && !(RX_BitsRemaining))
 	{
 		/* Start bit - TX line low */
 		STXPORT &= ~(1 << STX);
diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index c08dfe980caac07389cc99b5ec23cd790469e268..1f0070319fbc1bbcce49ddcea3461979f163911e 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -180,7 +180,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 	{
 		EndpointConfigSuccess &= CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
 
-		/* Configure the UART flush timer */
+		/* Configure the UART flush timer - run at FCPU/1024 for maximum interval before overflow */
 		TCCR0B = ((1 << CS02) | (1 << CS00));
 	}
 	else