diff --git a/reflector/M17Protocol.cpp b/reflector/M17Protocol.cpp
index 32e0658..df228f9 100644
--- a/reflector/M17Protocol.cpp
+++ b/reflector/M17Protocol.cpp
@@ -399,8 +399,7 @@ void CM17Protocol::EncodeM17Packet(SM17Frame &frame, const CDvHeaderPacket &Head
 
 	// do the lich structure first
 	// first, the src callsign (the lich.dest will be set in HandleQueue)
-	CCallsign from = g_Reflector.GetCallsign();
-	from.SetCSModule(Header.GetPacketModule());
+	CCallsign from = Header.GetMyCallsign();
 	from.CodeOut(frame.lich.addr_src);
 	// then the frame type, if the incoming frame is M17 1600, then it will be Voice+Data only, otherwise Voice-Only
 	frame.lich.frametype = htons((ECodecType::c2_1600==codec_in) ? 0x7U : 0x5U);
diff --git a/reflector/Main.h b/reflector/Main.h
index 3bf2106..f8cd3d3 100644
--- a/reflector/Main.h
+++ b/reflector/Main.h
@@ -63,7 +63,7 @@
 
 #define VERSION_MAJOR                   0
 #define VERSION_MINOR                   0
-#define VERSION_REVISION                5
+#define VERSION_REVISION                6
 
 // global ------------------------------------------------------