diff --git a/YSF2NXDN/YSF2NXDN.cpp b/YSF2NXDN/YSF2NXDN.cpp
index aa08f5d..2f236c7 100644
--- a/YSF2NXDN/YSF2NXDN.cpp
+++ b/YSF2NXDN/YSF2NXDN.cpp
@@ -546,8 +546,8 @@ int CYSF2NXDN::run()
 
 						m_netSrc = m_lookup->findCS(srcId);
 						//m_netDst = m_lookup->findCS(dstId);
-						if (srcId != 9999U) { m_netDst = m_lookup->findCS(dstId); } else { m_netDst = std::to_string(dstId); }
-						LogMessage("Received NXDN Header: Src: %s Dst: %s", m_netSrc.c_str(), m_netDst.c_str());
+						m_netDst = "TG " + std::to_string(dstId);
+                                                LogMessage("Received NXDN Header: Src: %s Dst: %s", m_netSrc.c_str(), m_netDst.c_str());
 
 						m_conv.putNXDNHeader();
 						m_nxdnFrames = 0;