diff --git a/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java b/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java
index 65470e7ec..e7eacfc74 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java
@@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity.memory;
 
 import net.minecraft.server.BlockPosition;
 import net.minecraft.server.GlobalPos;
+import net.minecraft.server.MinecraftSerializableLong;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.CraftServer;
@@ -14,8 +15,8 @@ public final class CraftMemoryMapper {
     public static Object fromNms(Object object) {
         if (object instanceof GlobalPos) {
             return fromNms((GlobalPos) object);
-        } else if (object instanceof Long) {
-            return object;
+        } else if (object instanceof MinecraftSerializableLong) {
+            return ((MinecraftSerializableLong) object).a();
         }
 
         throw new UnsupportedOperationException("Do not know how to map " + object);
@@ -27,7 +28,7 @@ public final class CraftMemoryMapper {
         } else if (object instanceof Location) {
             return toNms((Location) object);
         } else if (object instanceof Long) {
-            return object;
+            return MinecraftSerializableLong.a((Long) object);
         }
 
         throw new UnsupportedOperationException("Do not know how to map " + object);