diff --git a/src/main/java/baritone/command/defaults/ElytraCommand.java b/src/main/java/baritone/command/defaults/ElytraCommand.java
index f96901b9b..3414c7bb3 100644
--- a/src/main/java/baritone/command/defaults/ElytraCommand.java
+++ b/src/main/java/baritone/command/defaults/ElytraCommand.java
@@ -64,7 +64,7 @@ public class ElytraCommand extends Command {
         if (y <= 0 || y >= 128) {
             throw new CommandInvalidStateException("The y of the goal is not between 0 and 128");
         }
-        ((Baritone) baritone).getElytraBehavior().pathTo(new BlockPos(x, y, z));
+        baritone.getElytraBehavior().pathTo(new BlockPos(x, y, z));
     }
 
     @Override
diff --git a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
index ef566bb8d..e7f7c9497 100644
--- a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
+++ b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
@@ -181,7 +181,7 @@ public class ExecutionControlCommands {
                     paused[0] = false;
                 }
                 baritone.getPathingBehavior().cancelEverything();
-                ((Baritone) baritone).getElytraBehavior().cancel();
+                baritone.getElytraBehavior().cancel();
                 logDirect("ok canceled");
             }
 
diff --git a/src/main/java/baritone/command/defaults/ForceCancelCommand.java b/src/main/java/baritone/command/defaults/ForceCancelCommand.java
index 60ccdab01..bc6dbd0a4 100644
--- a/src/main/java/baritone/command/defaults/ForceCancelCommand.java
+++ b/src/main/java/baritone/command/defaults/ForceCancelCommand.java
@@ -40,7 +40,7 @@ public class ForceCancelCommand extends Command {
         IPathingBehavior pathingBehavior = baritone.getPathingBehavior();
         pathingBehavior.cancelEverything();
         pathingBehavior.forceCancel();
-        ((Baritone) baritone).getElytraBehavior().cancel();
+        baritone.getElytraBehavior().cancel();
         logDirect("ok force canceled");
     }