diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
index 9b5078c9..9cec6150 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
@@ -364,12 +364,36 @@ public class Disguise {
             tempWatcher.setValue(dataNo, disguiseValues.get(dataNo));
         }
         watcher = tempWatcher;
+        boolean doesntMove = false;
+        switch (getType()) {
+        case ARROW:
+        case BAT:
+        case BOAT:
+        case ENDER_CRYSTAL:
+        case ENDER_DRAGON:
+        case GHAST:
+        case ITEM_FRAME:
+        case MINECART:
+        case MINECART_CHEST:
+        case MINECART_FURNACE:
+        case MINECART_HOPPER:
+        case MINECART_MOB_SPAWNER:
+        case MINECART_TNT:
+        case PAINTING:
+        case PLAYER:
+        case SQUID:
+        case WITHER:
+            doesntMove = true;
+        default:
+            break;
+        }
+        final boolean sendVector = !doesntMove;
         // A scheduler to clean up any unused disguises.
         runnable = new BukkitRunnable() {
             public void run() {
                 if (!entity.isValid()) {
                     DisguiseAPI.undisguiseToAll(entity);
-                } else if (DisguiseAPI.isVelocitySent() && !entity.isOnGround()) {
+                } else if (sendVector && DisguiseAPI.isVelocitySent() && !entity.isOnGround()) {
                     Vector vector = entity.getVelocity();
                     if (vector.getY() != 0)
                         return;
diff --git a/src/me/libraryaddict/disguise/LibsDisguises.java b/src/me/libraryaddict/disguise/LibsDisguises.java
index 8de9a865..f8fa4336 100644
--- a/src/me/libraryaddict/disguise/LibsDisguises.java
+++ b/src/me/libraryaddict/disguise/LibsDisguises.java
@@ -225,7 +225,6 @@ public class LibsDisguises extends JavaPlugin {
         getCommand("disguiseradius").setExecutor(new DisguiseRadiusCommand(getConfig().getInt("DisguiseRadiusMax")));
         getCommand("undisguiseradius").setExecutor(new UndisguiseRadiusCommand(getConfig().getInt("UndisguiseRadiusMax")));
         registerValues();
-        // doVectors();
     }
 
     private void registerValues() {