diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java
index f57d1245..d3691dfd 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java
@@ -84,13 +84,15 @@ public class LivingWatcher extends FlagWatcher {
 
     public void setCustomName(String name) {
         if (!getCustomName().equals(name)) {
+            if (name.length() > 64)
+                name = name.substring(0, 64);
             setValue(10, name);
             sendData(10);
         }
     }
 
     public void setCustomNameVisible(boolean display) {
-        if (this.isCustomNameVisible()) {
+        if (isCustomNameVisible() != display) {
             setValue(11, (byte) (display ? 1 : 0));
             sendData(11);
         }