diff --git a/src/main/java/org/mvplugins/multiverse/core/command/context/issueraware/IssuerAwareContextBuilder.java b/src/main/java/org/mvplugins/multiverse/core/command/context/issueraware/IssuerAwareContextBuilder.java
index 7df5fe70d..49421c52f 100644
--- a/src/main/java/org/mvplugins/multiverse/core/command/context/issueraware/IssuerAwareContextBuilder.java
+++ b/src/main/java/org/mvplugins/multiverse/core/command/context/issueraware/IssuerAwareContextBuilder.java
@@ -174,7 +174,7 @@ private <I extends IssuerAwareValue> I resolveValue(BukkitCommandExecutionContex
 
         int maxArgForAware = context.getFlagValue("maxArgForAware", Integer.MAX_VALUE);
         long argLengthWithoutFlags = context.getArgs().stream()
-                .takeWhile(value -> !value.startsWith("--") && !value.isEmpty())
+                .takeWhile(value -> !value.startsWith("-") && !value.isEmpty()) // ignore the flags
                 .count();
 
         if (resolve.equals("issuerAware") && argLengthWithoutFlags <= maxArgForAware) {
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java
index eadc55e11..c7ec1e5e4 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java
@@ -67,7 +67,7 @@ void onGameruleSetCommand(
             @Description("{@@mv-core.gamerule.set.value.description}")
             GameRuleValue gameRuleValue,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=2")
             @Syntax("[World or *]")
             @Description("{@@mv-core.gamerule.set.world.description}")
             LoadedMultiverseWorld[] worlds) {
@@ -114,7 +114,7 @@ void onGameruleResetCommand(
             @Description("{@@mv-core.gamerule.reset.gamerule.description}")
             GameRule gamerule,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=1")
             @Syntax("[World or *]")
             @Description("{@@mv-core.gamerule.reset.world.description}")
             LoadedMultiverseWorld[] worlds) {
@@ -152,7 +152,7 @@ void onGameruleResetCommand(
     void onGameruleListCommand(
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("<world>")
             @Description("{@@mv-core.gamerule.list.description.world}")
             LoadedMultiverseWorld world,