diff --git a/.gitignore b/.gitignore
index dffdf1c..f708bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 src/xlxd
 ambed/ambed
 ambedtest/ambedtest
+.DS_Store
+.vscode/
\ No newline at end of file
diff --git a/src/cimrsprotocol.cpp b/src/cimrsprotocol.cpp
index 1062646..afdb41b 100644
--- a/src/cimrsprotocol.cpp
+++ b/src/cimrsprotocol.cpp
@@ -908,9 +908,9 @@ char CImrsProtocol::DgidToModule(uint8 uiDgid) const
 {
     char cModule = ' ';
     
-    if ( (uiDgid >= 10) && (uiDgid < (10+NB_OF_MODULES)) )
+    if ( (uiDgid >= FIRST_DG_ID) && (uiDgid < (FIRST_DG_ID+NB_OF_MODULES)) )
     {
-        cModule = 'A' + (uiDgid-10);
+        cModule = 'A' + (uiDgid-FIRST_DG_ID);
     }
     return cModule;
     
@@ -921,7 +921,7 @@ uint8 CImrsProtocol::ModuleToDgid(char cModule) const
     
     if ( (cModule >= 'A') && (cModule < ('A'+NB_OF_MODULES)) )
     {
-        uiDgid = 10 + (cModule - 'A');
+        uiDgid = FIRST_DG_ID + (cModule - 'A');
     }
     return uiDgid;
 }
diff --git a/src/cysfprotocol.cpp b/src/cysfprotocol.cpp
index 572464f..4da4eb1 100644
--- a/src/cysfprotocol.cpp
+++ b/src/cysfprotocol.cpp
@@ -477,10 +477,10 @@ bool CYsfProtocol::IsValidDvHeaderPacket(const CIp &Ip, const CYSFFICH &Fich, co
             rpt1.SetModule(YSF_MODULE_ID);
             CCallsign rpt2 = m_ReflectorCallsign;
 
-            if ( (Fich.getSQ() >= 10) && (Fich.getSQ() < 10+NB_OF_MODULES) )
+            if ( (Fich.getSQ() >= FIRST_DG_ID) && (Fich.getSQ() < FIRST_DG_ID+NB_OF_MODULES) )
             {
                 // set module based on DG-ID value
-                rpt2.SetModule( 'A' + (char)(Fich.getSQ() - 10) );
+                rpt2.SetModule( 'A' + (char)(Fich.getSQ() - FIRST_DG_ID) );
             }
             else
             {
diff --git a/src/main.h b/src/main.h
index 861439e..27f6902 100644
--- a/src/main.h
+++ b/src/main.h
@@ -127,6 +127,7 @@
 #define YSF_DEFAULT_NODE_RX_FREQ        437000000                           // in Hz
 #define YSF_AUTOLINK_ENABLE             0                                   // 1 = enable, 0 = disable auto-link
 #define YSF_AUTOLINK_MODULE             'B'                                 // module for client to auto-link to
+#define FIRST_DG_ID                     24
 
 // G3 Terminal
 #define G3_PRESENCE_PORT                12346                               // UDP port