diff --git a/build-number.txt b/build-number.txt
index 9947b8e3..1b0b2d55 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-1995
\ No newline at end of file
+2005
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java
index 3dfaa6b4..71e6f9ba 100644
--- a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java
+++ b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java
@@ -3,7 +3,6 @@ package me.chayapak1.chomens_bot.command;
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.ColorUtilities;
-import me.chayapak1.chomens_bot.util.StringUtilities;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -261,7 +260,9 @@ public class CommandContext {
 
         final String quotesReplaced = joined.replaceAll("([\"'])(?:\\.|(?!\1).)*\1", "i");
 
-        final int count = StringUtilities.countCharacters(quotesReplaced, ' ');
+        final int count = quotesReplaced.isBlank() ?
+                0 :
+                quotesReplaced.split("\\s+").length;
 
         if (count > maximumArgs) throw new CommandException(
                 Component.translatable(
diff --git a/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java
index 5ffaf1c5..8b4cae68 100644
--- a/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java
+++ b/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java
@@ -9,11 +9,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 public class StringUtilities {
-    // https://stackoverflow.com/a/8910767/18518424
-    public static int countCharacters (String string, char character) {
-        return string.length() - string.replace(String.valueOf(character), "").length();
-    }
-
     // https://stackoverflow.com/a/35148974/18518424
     public static String truncateToFitUtf8ByteLength (String s, int maxBytes) {
         if (s == null) {