diff --git a/CHANGELOG.md b/CHANGELOG.md
index 457e2d5c..3f647a85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Use the correct default range for Double and Float parsers in the StandardParserRegistry
  - Fix Bukkit alias command suggestions without Brigadier
  - Fix Bukkit command alias registration when using Brigadier
+ - Fixed a bug where providing valid input for an argument caused cloud to no longer make suggestions
 
 ## [1.1.0] - 2020-10-24
 
diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java
index debeca33..a2e7651a 100644
--- a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java
+++ b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java
@@ -493,10 +493,10 @@ public final class CommandTree<C> {
         }
     }
 
-    private @NonNull List<String> suggestionsForDynamicArgument(
+    private @NonNull List<@NonNull String> suggestionsForDynamicArgument(
             final @NonNull CommandContext<C> commandContext,
             final @NonNull Queue<@NonNull String> commandQueue,
-            final @NonNull Node<CommandArgument<C, ?>> child
+            final @NonNull Node<@Nullable CommandArgument<C, ?>> child
     ) {
         /* When we get in here, we need to treat compound arguments a little differently */
         if (child.getValue() instanceof CompoundArgument) {
@@ -552,7 +552,7 @@ public final class CommandTree<C> {
             }
 
             // Store original input command queue before the parsers below modify it
-            final Queue<String> commandQueueOriginal = new LinkedList<String>(commandQueue);
+            final Queue<String> commandQueueOriginal = new LinkedList<>(commandQueue);
 
             // START: Preprocessing
             final ArgumentParseResult<Boolean> preParseResult = child.getValue().preprocess(
diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/ComponentHelper.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/ComponentHelper.java
index 5ff3be05..8b43336e 100644
--- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/ComponentHelper.java
+++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/ComponentHelper.java
@@ -25,7 +25,6 @@ package cloud.commandframework.minecraft.extras;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.TextReplacementConfig;
 import net.kyori.adventure.text.format.TextColor;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -42,12 +41,10 @@ final class ComponentHelper {
             final @NonNull Component component,
             final @NonNull TextColor highlightColor
     ) {
-        return component.replaceText(
-                TextReplacementConfig.builder()
-                        .match(SPECIAL_CHARACTERS_PATTERN)
-                        .replacement(match -> match.color(highlightColor))
-                        .build()
-        );
+        return component.replaceText(config -> {
+            config.match(SPECIAL_CHARACTERS_PATTERN);
+            config.replacement(match -> match.color(highlightColor));
+        });
     }
 
     public static @NonNull Component repeat(