diff --git a/pom.xml b/pom.xml
index eac374a..55b7d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21.6-R0.1-SNAPSHOT</version>
+            <version>1.21.7-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/pk/ajneb97/MainCommand.java b/src/main/java/pk/ajneb97/MainCommand.java
index f10c7d4..ac3af16 100644
--- a/src/main/java/pk/ajneb97/MainCommand.java
+++ b/src/main/java/pk/ajneb97/MainCommand.java
@@ -398,7 +398,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
                 commands.add("verify");commands.add("migrate");commands.add("open");
             }
             for(String c : commands) {
-                if(args[0].isEmpty() || c.startsWith(args[0].toLowerCase())) {
+                if(args[0].isEmpty() || c.toLowerCase().startsWith(args[0].toLowerCase())) {
                     completions.add(c);
                 }
             }
diff --git a/src/main/java/pk/ajneb97/PlayerKits2.java b/src/main/java/pk/ajneb97/PlayerKits2.java
index 16212f7..a539d88 100644
--- a/src/main/java/pk/ajneb97/PlayerKits2.java
+++ b/src/main/java/pk/ajneb97/PlayerKits2.java
@@ -139,10 +139,15 @@ public class PlayerKits2 extends JavaPlugin {
                 serverVersion = ServerVersion.v1_21_R4;
                 break;
             case "1.21.6":
+            case "1.21.7":
                 serverVersion = ServerVersion.v1_21_R5;
                 break;
             default:
-                serverVersion = ServerVersion.valueOf(packageName.replace("org.bukkit.craftbukkit.", ""));
+                try{
+                    serverVersion = ServerVersion.valueOf(packageName.replace("org.bukkit.craftbukkit.", ""));
+                }catch(Exception e){
+                    serverVersion = ServerVersion.v1_21_R5;
+                }
         }
     }
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index c32abd9..5833b9c 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: pk.ajneb97.PlayerKits2
-version: 1.18.1
+version: 1.18.2
 name: PlayerKits2
 api-version: 1.13
 softdepend: [Vault,PlaceholderAPI]