diff --git a/data_embed/index.html b/data_embed/index.html
index 9bb42cc..16ef656 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -580,6 +580,9 @@
                                             <option value="2">
                                                 WIDE1 (fill-in) Digi
                                             </option>
+                                            <option value="3">
+                                                WIDE1 and/or WIDE2 (fill-in) Digi
+                                            </option>
                                         </select>
                                     </div>
                                 </div>
diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp
index ae8b1af..54eb42d 100644
--- a/src/digi_utils.cpp
+++ b/src/digi_utils.cpp
@@ -30,7 +30,15 @@ namespace DIGI_Utils {
         if (Config.digi.mode == 2) {
             tempPath.replace("WIDE1-1", Config.callsign + "*");
         } else if (Config.digi.mode == 3) {
-            tempPath.replace("WIDE2-1", Config.callsign + "*");
+            if (path.indexOf("WIDE1-1")) {
+                tempPath.replace("WIDE1-1", Config.callsign + "*");
+            }
+            if (path.indexOf("WIDE2-1")) {
+                tempPath.replace("WIDE2-1", Config.callsign + "*");
+            }
+            if (path.indexOf(Config.callsign + "*," + Config.callsign + "*")) {
+                tempPath.replace(Config.callsign + "*," + Config.callsign + "*", Config.callsign + "*");
+            }
         }
         packetToRepeat += tempPath;
         if (thirdParty) {
@@ -51,7 +59,7 @@ namespace DIGI_Utils {
         }
         if (temp.indexOf(",") > 2) { // checks for path
             const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
-            if ((Config.digi.mode == 2 && path.indexOf("WIDE1-1") != - 1) || (Config.digi.mode == 3 && path.indexOf("WIDE2-1") != -1)) {
+            if ((Config.digi.mode == 2 && path.indexOf("WIDE1-1") != - 1) || (Config.digi.mode == 3 && (path.indexOf("WIDE1-1") != - 1 || path.indexOf("WIDE2-1") != -1))) {
                 return buildPacket(path, packet, thirdParty);
             } else {
                 return "";