diff --git a/YSFControl.cpp b/YSFControl.cpp
index 3830ff5..63d23ca 100644
--- a/YSFControl.cpp
+++ b/YSFControl.cpp
@@ -171,15 +171,13 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len)
 			}
 		}
 
-		fich.setFI(YSF_FI_COMMUNICATIONS);
-		fich.setFN(fn);
-		fich.setFT(ft);
-		fich.setBN(bn);
-		fich.setBT(bt);
+		m_lastFICH.setFI(YSF_FI_COMMUNICATIONS);
+		m_lastFICH.setFN(fn);
+		m_lastFICH.setBN(bn);
+	} else {
+		m_lastFICH = fich;
 	}
 
-	m_lastFICH = fich;
-
 #ifdef notdef
 	// Stop repeater packets coming through, unless we're acting as a remote gateway
 	if (m_remoteGateway) {