diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index 1733423..b585ded 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -803,7 +803,7 @@ namespace DS4Windows
                                 keyType += DS4KeyType.Unbound;
                         if (dcs.keyType.HasFlag(DS4KeyType.HoldMacro))
                             keyType += DS4KeyType.HoldMacro;
-                        if (dcs.keyType.HasFlag(DS4KeyType.Macro))
+                        else if (dcs.keyType.HasFlag(DS4KeyType.Macro))
                             keyType += DS4KeyType.Macro;
                         if (dcs.keyType.HasFlag(DS4KeyType.Toggle))
                             keyType += DS4KeyType.Toggle;
diff --git a/DS4Windows/DS4Forms/KBM360.cs b/DS4Windows/DS4Forms/KBM360.cs
index 0d1a9b3..7cf95ed 100644
--- a/DS4Windows/DS4Forms/KBM360.cs
+++ b/DS4Windows/DS4Forms/KBM360.cs
@@ -454,7 +454,7 @@ namespace DS4Windows
                         lBMacroOn.Visible = true;
                         foreach (int i in tag)
                             macrostag.Add(i);
-                    if (Global.GetDS4KeyType(device, button.Name, rBShiftModifer.Checked).HasFlag(DS4KeyType.RepeatMacro))
+                    if (Global.GetDS4KeyType(device, button.Name, rBShiftModifer.Checked).HasFlag(DS4KeyType.HoldMacro))
                         macrorepeat = true;
                 }
                 else if (tagO is string || tagO is X360Controls)
diff --git a/DS4Windows/DS4Forms/Options.cs b/DS4Windows/DS4Forms/Options.cs
index edbe88b..4cf3da7 100644
--- a/DS4Windows/DS4Forms/Options.cs
+++ b/DS4Windows/DS4Forms/Options.cs
@@ -1082,7 +1082,7 @@ namespace DS4Windows
             if (SC) kt |= DS4KeyType.ScanCode;
             if (TG) kt |= DS4KeyType.Toggle;
             if (MC) kt |= DS4KeyType.Macro;
-            if (MR) kt |= DS4KeyType.RepeatMacro;
+            if (MR) kt |= DS4KeyType.HoldMacro;
             UpdateDS4CSetting(device, ctrl.Name, shift, tag.Key, tag.Value, kt, sTrigger);
         }
 
diff --git a/DS4Windows/DS4Forms/RecordBox.cs b/DS4Windows/DS4Forms/RecordBox.cs
index 4f2ecdb..3866eff 100644
--- a/DS4Windows/DS4Forms/RecordBox.cs
+++ b/DS4Windows/DS4Forms/RecordBox.cs
@@ -784,8 +784,7 @@ namespace DS4Windows
                     kbm.macrostag = macros;
                     kbm.macros = macronames;
                     kbm.lBMacroOn.Visible = true;
-                    if (cBStyle.SelectedIndex == 1)
-                        kbm.macrorepeat = true;
+                    kbm.macrorepeat = cBStyle.SelectedIndex == 1;
                     saved = true;
                     if (sender != kbm)
                         kbm.Close();
@@ -796,8 +795,7 @@ namespace DS4Windows
                     sA.macros = macronames;
                     sA.lbMacroRecorded.Text = string.Join(", ", macronames);
                     //kbm.lBMacroOn.Visible = true;
-                    if (cBStyle.SelectedIndex == 1)
-                        sA.macrorepeat = true;
+                    sA.macrorepeat = cBStyle.SelectedIndex == 1;
                     saved = true;
                     //if (sender != sA)
                     // sA.Close();