diff --git a/src/main/java/net/minecraftforge/server/console/TerminalHandler.java b/src/main/java/net/minecraftforge/server/console/TerminalHandler.java
index a699decf88..976678f2f0 100644
--- a/src/main/java/net/minecraftforge/server/console/TerminalHandler.java
+++ b/src/main/java/net/minecraftforge/server/console/TerminalHandler.java
@@ -29,7 +29,7 @@ public static boolean handleCommands(DedicatedServer server)
         LineReader reader = LineReaderBuilder.builder()
                 .appName("Forge")
                 .terminal(terminal)
-                .completer(new ConsoleCommandCompleter(server))
+                .completer(new org.bukkit.craftbukkit.v1_16_R3.command.ConsoleCommandCompleter(server))
                 .build();
         reader.setOpt(LineReader.Option.DISABLE_EVENT_EXPANSION);
         reader.unsetOpt(LineReader.Option.INSERT_TAB);