diff --git a/DStarControl.cpp b/DStarControl.cpp
index effd0df..d08e96d 100644
--- a/DStarControl.cpp
+++ b/DStarControl.cpp
@@ -149,8 +149,8 @@ void CDStarControl::writeModem(unsigned char *data)
 			if (m_net) {
 				// Modify the header
 				header.setRepeater(false);
-				header.setRPTCall1(m_gateway);
-				header.setRPTCall2(m_callsign);
+				header.setRPTCall1(m_callsign);
+				header.setRPTCall2(m_gateway);
 				header.get(data + 1U);
 
 				for (unsigned i = 0U; i < 3U; i++)
@@ -386,7 +386,7 @@ void CDStarControl::writeNetwork()
 		if (m_state != RS_LISTENING)
 			return;
 
-		CDStarHeader header(data + 2U);
+		CDStarHeader header(data + 1U);
 
 		unsigned char my1[DSTAR_LONG_CALLSIGN_LENGTH];
 		header.getMyCall1(my1);
diff --git a/Version.h b/Version.h
index cdc3d00..47dcb63 100644
--- a/Version.h
+++ b/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20160128";
+const char* VERSION = "20160131";
 
 #endif