diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityData.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityData.java
index 923211049..a40c5923e 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityData.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityData.java
@@ -11,17 +11,17 @@ public interface EntityData<T> {
 
     default Object createEntityDataIfNotDefaultValue(T value) {
         if (defaultValue().equals(value)) return null;
-        return EntityDataValue.create(id(), serializer(), value);
+        return EntityDataValue.create(id(), serializer(), entityDataAccessor(), value);
     }
 
     default void addEntityDataIfNotDefaultValue(T value, List<Object> list) {
         if (!defaultValue().equals(value)) {
-            list.add(EntityDataValue.create(id(), serializer(), value));
+            list.add(EntityDataValue.create(id(), serializer(), entityDataAccessor(), value));
         }
     }
 
     default void addEntityData(T value, List<Object> list) {
-        list.add(EntityDataValue.create(id(), serializer(), value));
+        list.add(EntityDataValue.create(id(), serializer(), entityDataAccessor(), value));
     }
 
     static <T> EntityData<T> of(int id, Object serializer, T defaultValue) {
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityDataValue.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityDataValue.java
index 064983cdf..fee5d034f 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityDataValue.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityDataValue.java
@@ -98,8 +98,7 @@ public class EntityDataValue {
         throw new IllegalAccessError("Utility class");
     }
 
-    public static Object create(int id, Object serializer, Object value) {
-        Object entityDataAccessor = FastNMS.INSTANCE.constructor$EntityDataAccessor(id, serializer);
+    public static Object create(int id, Object serializer, Object entityDataAccessor, Object value) {
         return FastNMS.INSTANCE.method$SynchedEntityData$DataValue$create(entityDataAccessor, value);
     }
 }