diff --git a/src/me/rockyhawk/commandpanels/commandtags/tags/other/SpecialTags.java b/src/me/rockyhawk/commandpanels/commandtags/tags/other/SpecialTags.java
index c63ffd9..cc7b29d 100644
--- a/src/me/rockyhawk/commandpanels/commandtags/tags/other/SpecialTags.java
+++ b/src/me/rockyhawk/commandpanels/commandtags/tags/other/SpecialTags.java
@@ -84,7 +84,7 @@ public class SpecialTags implements Listener {
             e.commandTagUsed();
             //if player uses op= it will perform command as op
             final int delaySeconds = Integer.parseInt(e.args[0]);
-            String finalCommand = String.join(" ",e.args).replace(e.args[0],"");
+            String finalCommand = String.join(" ",e.args).replace(e.args[0],"").trim();
             new BukkitRunnable() {
                 @Override
                 public void run() {
diff --git a/src/me/rockyhawk/commandpanels/generatepanels/GenUtils.java b/src/me/rockyhawk/commandpanels/generatepanels/GenUtils.java
index fe36fc9..a5871df 100644
--- a/src/me/rockyhawk/commandpanels/generatepanels/GenUtils.java
+++ b/src/me/rockyhawk/commandpanels/generatepanels/GenUtils.java
@@ -93,7 +93,7 @@ public class GenUtils implements Listener {
         file = YamlConfiguration.loadConfiguration(new File(folder + File.separator + date + ".yml"));
         file.set("panels." + date + ".perm", "default");
 
-        if(inv.getHolder() instanceof Chest || inv.getHolder() instanceof DoubleChest){
+        if(inv.getType().toString().contains("CHEST")){
             file.set("panels." + date + ".rows", inv.getSize()/9);
         }else{
             file.set("panels." + date + ".rows", inv.getType().toString());