diff --git a/build-number.txt b/build-number.txt
index 7dc2855d..ca7d3f4d 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-3283
\ No newline at end of file
+3284
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java
index 76aeed44..a519b2c4 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java
@@ -78,12 +78,10 @@ public class ChatCommandHandlerPlugin implements Listener {
         final String displayName = ComponentUtilities.stringify(displayNameComponent);
         final String contents = ComponentUtilities.stringify(messageComponent);
 
-        String prefix = null;
-
-        for (final String eachPrefix : prefixes) {
-            if (!contents.startsWith(eachPrefix)) continue;
-            prefix = eachPrefix;
-        }
+        final String prefix = prefixes.stream()
+                .filter(eachPrefix -> contents.toLowerCase().startsWith(eachPrefix))
+                .findFirst()
+                .orElse(null);
 
         if (prefix == null) return;