diff --git a/SpigotCore_Main/src/de/steamwar/entity/REntity.java b/SpigotCore_Main/src/de/steamwar/entity/REntity.java
index 281b66f..2713318 100644
--- a/SpigotCore_Main/src/de/steamwar/entity/REntity.java
+++ b/SpigotCore_Main/src/de/steamwar/entity/REntity.java
@@ -71,7 +71,7 @@ public class REntity {
     protected final Map<Object, ItemStack> itemSlots;
 
     public REntity(REntityServer server, EntityType entityType, Location location) {
-        this(server, entityType, new UUID(random.nextLong() & -61441L | 16384L, random.nextLong() & 4611686018427387903L | -9223372036854775808L), location,0);
+        this(server,entityType,location,0);
     }
 
     protected REntity(REntityServer server, EntityType entityType, Location location,int objectData) {
@@ -384,9 +384,20 @@ public class REntity {
 
         int index;
         switch (Core.getVersion()) {
-            case 8: index = 10;
-            case 19: index = 7;
-            default: index = 6;
+            case 8:
+                index = 10;
+                break;
+            case 9:
+            case 14:
+            case 12:
+            case 10:
+            case 15:
+            case 18:
+                index = 6;
+                break;
+            default:
+                index = 7;
+                break;
         }