diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index b0eb0256..c3f14cd7 100644
--- a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -25,6 +25,7 @@ import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
 import me.libraryaddict.disguise.disguisetypes.watchers.AgeableWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.EndermanWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.ItemFrameWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.MinecartWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.PlayerWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher;
 import me.libraryaddict.disguise.disguisetypes.TargetedDisguise.TargetType;
@@ -582,6 +583,13 @@ public class DisguiseUtilities {
         return ReflectionManager.getSkullBlob(gameprofile);
     }
 
+    /**
+     * Please note that in the future when 'DualInt' and the like are removed. This should break..
+     * 
+     * However, that should be negated in the future as I'd be able to set the watcher index's as per the spigot version.
+     * 
+     * Instead of checking on the player's version every single packet..
+     */
     public static List<WrappedWatchableObject> rebuildForVersion(Player player, FlagWatcher watcher,
             List<WrappedWatchableObject> list) {
         if (!ReflectionManager.is1_8(player))
@@ -622,6 +630,13 @@ public class DisguiseUtilities {
                     backups.add(obj);
                 }
                 break;
+            case 20:
+                if (watcher instanceof MinecartWatcher) {
+                    // TODO
+                    backups.add(obj);
+                } else {
+                    backups.add(obj);
+                }
             default:
                 backups.add(obj);
                 break;