diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
index f059b7c4..1cab1909 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
@@ -46,11 +46,16 @@ public class FlagWatcher {
             if (entityValues.containsKey(watch.a())) {
                 if (entityValues.get(watch.a()) == null)
                     continue;
-                boolean doD = watch.d();
                 Object value = entityValues.get(watch.a());
+                boolean doD = watch.d();
                 watch = new WatchableObject(classTypes.get(value.getClass()), watch.a(), value);
                 if (!doD)
                     watch.a(false);
+            } else {
+                boolean doD = watch.d();
+                watch = new WatchableObject(watch.c(), watch.a(), watch.b());
+                if (!doD)
+                    watch.a(false);
             }
             newList.add(watch);
         }