diff --git a/QnetGateway.cpp b/QnetGateway.cpp
index 5be8922..1ff254f 100644
--- a/QnetGateway.cpp
+++ b/QnetGateway.cpp
@@ -1209,13 +1209,8 @@ void CQnetGateway::Process()
 							rptrbuf.vpkt.streamid    = g2buf.streamid;
 							rptrbuf.vpkt.ctrl        = g2buf.ctrl;
 							memcpy(rptrbuf.vpkt.hdr.flag, g2buf.hdr.flag,   3);
-							if (is_icom) {
-								memcpy(rptrbuf.vpkt.hdr.r1,   g2buf.hdr.rpt2,   8);
-								memcpy(rptrbuf.vpkt.hdr.r2,   g2buf.hdr.rpt1,   8);
-							} else {
-								memcpy(rptrbuf.vpkt.hdr.r1,   g2buf.hdr.rpt1,   8);
-								memcpy(rptrbuf.vpkt.hdr.r2,   g2buf.hdr.rpt2,   8);
-							}
+							memcpy(rptrbuf.vpkt.hdr.r1,   g2buf.hdr.rpt2,   8);
+							memcpy(rptrbuf.vpkt.hdr.r2,   g2buf.hdr.rpt1,   8);
 							memcpy(rptrbuf.vpkt.hdr.ur,   g2buf.hdr.urcall, 8);
 							memcpy(rptrbuf.vpkt.hdr.my,   g2buf.hdr.mycall, 8);
 							memcpy(rptrbuf.vpkt.hdr.nm,   g2buf.hdr.sfx,    4);
diff --git a/QnetITAP.cpp b/QnetITAP.cpp
index be8e271..0176917 100644
--- a/QnetITAP.cpp
+++ b/QnetITAP.cpp
@@ -421,8 +421,7 @@ bool CQnetITAP::ProcessGateway(const int len, const unsigned char *raw)
 				return true;
 			}
 			if (log_qso)
-				printf("Sent ITAP to %s ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", ITAP_DEVICE.c_str(),
-						itap.header.ur, itap.header.r1, itap.header.r2, itap.header.my, itap.header.nm);
+				printf("Sent ITAP to %s ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", ITAP_DEVICE.c_str(), itap.header.ur, itap.header.r2, itap.header.r1, itap.header.my, itap.header.nm);
 		} else {	// write an AMBE packet
 			itap.length = 16U;
 			itap.type = 0x22U;
@@ -509,8 +508,7 @@ bool CQnetITAP::ProcessITAP(const unsigned char *buf)
 			return true;
 		}
 		if (log_qso)
-			printf("Sent DSTR to %u, streamid=%04x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", G2_IN_PORT, ntohs(dstr.vpkt.streamid),
-					dstr.vpkt.hdr.ur, dstr.vpkt.hdr.r1, dstr.vpkt.hdr.r2, dstr.vpkt.hdr.my, dstr.vpkt.hdr.nm);
+			printf("Sent DSTR to %u, streamid=%04x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", G2_IN_PORT, ntohs(dstr.vpkt.streamid), dstr.vpkt.hdr.ur, dstr.vpkt.hdr.r1, dstr.vpkt.hdr.r2, dstr.vpkt.hdr.my, dstr.vpkt.hdr.nm);
 	} else if (16 == len) {	// ambe
 		dstr.remaining = 0x16;
 		dstr.vpkt.ctrl = itap.voice.sequence;