diff --git a/Common/IcomController.cpp b/Common/IcomController.cpp
index daca59c..73b3f6c 100644
--- a/Common/IcomController.cpp
+++ b/Common/IcomController.cpp
@@ -133,9 +133,15 @@ void* CIcomController::Entry()
 			}
 			break;
 
+		case RTI_STATUS:
+			// wxLogMessage(wxT("RTI_STATUS"));
+			if (m_buffer[2U] == 0x01U)
+				m_txSpace = true;
+			break;
+
 		case RTI_HEADER_ACK:
 			// wxLogMessage(wxT("RTI_HEADER_ACK"));
-			m_txSpace = true;
+			// m_txSpace = true;
 			break;
 
 		case RTI_DATA_ACK:
@@ -155,7 +161,7 @@ void* CIcomController::Entry()
 			unsigned int len = m_buffer[0U];
 			m_txData.getData(m_buffer + 1U, len);
 
-			// CUtils::dump(wxT("Sending"), m_buffer, len + 1U);
+			CUtils::dump(wxT("Sending"), m_buffer, len + 1U);
 
 			int ret = m_serial.write(m_buffer, len + 1U);
 			if (ret != int(len + 1U))
@@ -339,11 +345,11 @@ RESP_TYPE_ICOM CIcomController::getResponse(unsigned char *buffer, unsigned int&
 			Sleep(5UL);
 	}
 
-	// CUtils::dump(wxT("Received"), buffer, length + 1U);
+	CUtils::dump(wxT("Received"), buffer, length + 1U);
 
 	switch (buffer[1U]) {
 		case 0x03U:
-			return RTI_TIMEOUT;
+			return RTI_STATUS;
 		case 0x10U:
 			return RTI_HEADER;
 		case 0x12U:
diff --git a/Common/IcomController.h b/Common/IcomController.h
index eb0f797..ee4953b 100644
--- a/Common/IcomController.h
+++ b/Common/IcomController.h
@@ -34,7 +34,8 @@ enum RESP_TYPE_ICOM {
 	RTI_DATA,
 	RTI_EOT,
 	RTI_HEADER_ACK,
-	RTI_DATA_ACK
+	RTI_DATA_ACK,
+	RTI_STATUS
 };
 
 class CIcomController : public CModem {
diff --git a/DStarRepeater/DStarRepeaterApp.cpp b/DStarRepeater/DStarRepeaterApp.cpp
index 2a52399..a1779aa 100644
--- a/DStarRepeater/DStarRepeaterApp.cpp
+++ b/DStarRepeater/DStarRepeaterApp.cpp
@@ -335,7 +335,7 @@ void CDStarRepeaterApp::createThread()
 	m_config->getModem(modemType);
 
 	// DVAP can only do simplex, force the mode accordingly
-	if (modemType.IsSameAs("DVAP") || modemType.IsSameAs(wxT("Icom Access Point / Terminal Mode"))) {
+	if (modemType.IsSameAs("DVAP") || modemType.IsSameAs(wxT("Icom Access Point/Terminal Mode"))) {
 		if (mode == MODE_DUPLEX) {
 			wxLogInfo("Changing mode from DUPLEX to SIMPLEX");
 			mode = MODE_SIMPLEX;