diff --git a/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java b/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java
index b77251a7..393ac4e0 100644
--- a/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java
+++ b/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java
@@ -40,8 +40,8 @@ public class LDUpdate implements LDCommand {
         }
 
         boolean releaseBuilds = checker.isUsingReleaseBuilds();
-        boolean wantsDownload = args[0].endsWith("!");
         boolean wantsCheck = args[0].endsWith("?");
+        boolean wantsDownload = args[0].endsWith("!") || !wantsCheck;
 
         if (args.length > 1) {
             boolean previous = releaseBuilds;
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java b/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
index e4c26227..7df5d899 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
@@ -479,9 +479,9 @@ public class DisguiseParser {
 
                 String name = p.getName();
 
-                arg = replace(arg, "%" + name + "-name%", targetName);
-                arg = replace(arg, "%" + name + "-displayname%", targetDisplayname);
-                arg = replace(arg, "%" + name + "-skin%", targetSkin);
+                arg = replace(arg, "%" + name + "-name%", name);
+                arg = replace(arg, "%" + name + "-displayname%", DisguiseUtilities.getDisplayName(p));
+                arg = replace(arg, "%" + name + "-skin%", getSkin(p));
 
                 EntityEquipment pEquip = p.getEquipment();