diff --git a/proxy/src/main/java/net/md_5/bungee/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/EntityMap.java
index b3637c30..40bf7f14 100644
--- a/proxy/src/main/java/net/md_5/bungee/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/EntityMap.java
@@ -42,7 +42,7 @@ public class EntityMap
         };
         entityIds[0x17] = new int[]
         {
-            1, 20
+            1 //, 20
         };
         entityIds[0x18] = new int[]
         {
@@ -149,5 +149,16 @@ public class EntityMap
                 }
             }
         }
+        if ( packetId == 0x17 )
+        {
+            int type = packet.getByte( 5 );
+            if ( type >= 60 && type <= 62 )
+            {
+                if ( packet.getInt( 20 ) == oldId )
+                {
+                    packet.setInt( 20, newId );
+                }
+            }
+        }
     }
 }