diff --git a/build-number.txt b/build-number.txt
index 9abe90ae..9df08341 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-3548
\ No newline at end of file
+3550
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java
index c39818e1..62742094 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java
@@ -19,8 +19,8 @@ import java.util.regex.PatternSyntaxException;
 
 // based off of HBot's supercb command
 public class CommandBlockCommand extends Command {
-    private static final Pattern USER_PATTERN = Pattern.compile("\\{username\\{(.*?)}}");
-    private static final Pattern UUID_PATTERN = Pattern.compile("\\{uuid\\{(.*?)}}");
+    private static final Pattern USER_PATTERN = Pattern.compile("\\{username\\{([^{}]+(?:\\{[^{}]*}[^{}]*)*)}}");
+    private static final Pattern UUID_PATTERN = Pattern.compile("\\{uuid\\{([^{}]+(?:\\{[^{}]*}[^{}]*)*)}}");
 
     public CommandBlockCommand () {
         super(