diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java
index 89806f98..50320289 100755
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -65,7 +65,6 @@ public enum Baritone implements IBaritone {
     private boolean initialized;
 
     private GameEventHandler gameEventHandler;
-    private InputOverrideHandler inputOverrideHandler;
     private Settings settings;
     private File dir;
     private ThreadPoolExecutor threadPool;
@@ -74,6 +73,7 @@ public enum Baritone implements IBaritone {
     private PathingBehavior pathingBehavior;
     private LookBehavior lookBehavior;
     private MemoryBehavior memoryBehavior;
+    private InputOverrideHandler inputOverrideHandler;
 
     private FollowProcess followProcess;
     private MineProcess mineProcess;
@@ -91,26 +91,30 @@ public enum Baritone implements IBaritone {
             return;
         }
         this.threadPool = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>());
-        this.inputOverrideHandler = new InputOverrideHandler();
+
 
         // Acquire the "singleton" instance of the settings directly from the API
         // We might want to change this...
         this.settings = BaritoneAPI.getSettings();
 
-        this.pathingControlManager = new PathingControlManager(this);
-
         this.behaviors = new ArrayList<>();
         {
             // the Behavior constructor calls baritone.registerBehavior(this) so this populates the behaviors arraylist
             pathingBehavior = new PathingBehavior(this);
             lookBehavior = new LookBehavior(this);
             memoryBehavior = new MemoryBehavior(this);
+            inputOverrideHandler = new InputOverrideHandler(this);
+            new ExampleBaritoneControl(this);
+        }
+
+        this.pathingControlManager = new PathingControlManager(this);
+        {
             followProcess = new FollowProcess(this);
             mineProcess = new MineProcess(this);
-            new ExampleBaritoneControl(this);
             customGoalProcess = new CustomGoalProcess(this); // very high iq
             getToBlockProcess = new GetToBlockProcess(this);
         }
+
         if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
             registerEventListener(BaritoneAutoTest.INSTANCE);
         }
diff --git a/src/main/java/baritone/utils/InputOverrideHandler.java b/src/main/java/baritone/utils/InputOverrideHandler.java
index 9cf7d1da..4d325fc7 100755
--- a/src/main/java/baritone/utils/InputOverrideHandler.java
+++ b/src/main/java/baritone/utils/InputOverrideHandler.java
@@ -17,6 +17,8 @@
 
 package baritone.utils;
 
+import baritone.Baritone;
+import baritone.behavior.Behavior;
 import net.minecraft.client.settings.KeyBinding;
 
 import java.util.HashMap;
@@ -30,7 +32,11 @@ import java.util.Map;
  * @author Brady
  * @since 7/31/2018 11:20 PM
  */
-public final class InputOverrideHandler implements Helper {
+public final class InputOverrideHandler extends Behavior implements Helper {
+
+    public InputOverrideHandler(Baritone baritone) {
+        super(baritone);
+    }
 
     /**
      * Maps keybinds to whether or not we are forcing their state down.