diff --git a/MassFarming/MassFarming.cs b/MassFarming/MassFarming.cs
index 686d33c..988e79a 100644
--- a/MassFarming/MassFarming.cs
+++ b/MassFarming/MassFarming.cs
@@ -6,7 +6,7 @@
 
 namespace MassFarming
 {
-    [BepInPlugin("xeio.MassFarming", "MassFarming", "1.9")]
+    [BepInPlugin("xeio.MassFarming", "MassFarming", "1.10")]
     public class MassFarming : BaseUnityPlugin
     {
         public static ConfigEntry<KeyboardShortcut> MassActionHotkey { get; private set; }
diff --git a/MassFarming/MassPickup.cs b/MassFarming/MassPickup.cs
index d62bb2d..f30d294 100644
--- a/MassFarming/MassPickup.cs
+++ b/MassFarming/MassPickup.cs
@@ -24,7 +24,17 @@ public static void Prefix(Player __instance, GameObject go, bool hold, bool alt)
                 return;
             }
 
-            if (!Input.GetKey(MassFarming.ControllerPickupHotkey.Value.MainKey) && !Input.GetKey(MassFarming.MassActionHotkey.Value.MainKey))
+            var controllerKey = MassFarming.ControllerPickupHotkey.Value.MainKey;
+			var controllerKeyEmpty = controllerKey == KeyCode.None;
+            var controllerPressed = Input.GetKey(controllerKey);
+            var controllerOk = controllerKeyEmpty || controllerPressed;
+
+            var keyboardKey = MassFarming.MassActionHotkey.Value.MainKey;
+            var keyboardKeyEmpty = keyboardKey == KeyCode.None;
+            var keyboardPressed = Input.GetKey(keyboardKey);
+            var keyboardOk = keyboardKeyEmpty || keyboardPressed;
+
+			if (!controllerOk && !keyboardOk)
             {
                 //Hotkey required
                 return;