diff --git a/DS4Windows/DS4Control/Mouse.cs b/DS4Windows/DS4Control/Mouse.cs
index d21c15d..f0cc9e4 100644
--- a/DS4Windows/DS4Control/Mouse.cs
+++ b/DS4Windows/DS4Control/Mouse.cs
@@ -359,7 +359,7 @@ namespace DS4Windows
                     tempBool = true;
                     for (int i = 0, arlen = disArray.Length; tempBool && i < arlen; i++)
                     {
-                        if (getDS4ControlsByName(disArray[i]) == false)
+                        if (disArray[i] == -1 || getDS4ControlsByName(disArray[i]) == false)
                             tempBool = false;
                     }
 
diff --git a/DS4Windows/DS4Forms/Options.cs b/DS4Windows/DS4Forms/Options.cs
index c8c70fd..4a53222 100644
--- a/DS4Windows/DS4Forms/Options.cs
+++ b/DS4Windows/DS4Forms/Options.cs
@@ -644,6 +644,7 @@ namespace DS4Windows.Forms
                 cBTouchpadJitterCompensation.Checked = TouchpadJitterCompensation[device];
 
                 tempInt = TouchpadInvert[device];
+                // Array values are set up so Array.IndexOf call is not necessary
                 touchpadInvertComboBox.SelectedIndex = touchpadInvertToValue[tempInt];
 
                 cBlowerRCOn.Checked = LowerRCOn[device];
diff --git a/TODO.md b/TODO.md
index 228cd58..53e045e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,7 @@
 # TODO
 
 * Check Options save
-* Check TouchpadInvert setting
+* ~~Check TouchpadInvert setting~~
 * Add cross dead zone (per axis) for sticks
 * ~~Add more curve options~~
 * ~~Transition to use Visual Studio 2019~~