diff --git a/Spigot-Server-Patches/Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/Fix-client-rendering-skulls-from-same-user.patch
index 03dc9c2cea..954b9d325e 100644
--- a/Spigot-Server-Patches/Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/Fix-client-rendering-skulls-from-same-user.patch
@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                if (nbttagcompound != null && nbttagcompound.hasKeyOfType("SkullOwner", 10)) {
 +                    NBTTagCompound owner = nbttagcompound.getCompound("SkullOwner");
 +                    if (owner.hasKey("Id")) {
-+                        nbttagcompound.setUUID("SkullOwnerOrig", owner.getUUID("Id"));
++                        nbttagcompound.map.put("SkullOwnerOrig", owner.map.get("Id"));
 +                        TileEntitySkull.sanitizeUUID(owner);
 +                    }
 +                }
@@ -56,8 +56,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                // Paper start - Fix skulls of same owner - restore orig ID since we changed it on send to client
 +                if (itemstack.tag.hasKey("SkullOwnerOrig")) {
 +                    NBTTagCompound owner = itemstack.tag.getCompound("SkullOwner");
-+                    if (itemstack.tag.hasUUID("SkullOwnerOrig")) {
-+                        owner.setUUID("Id", itemstack.tag.getUUID("SkullOwnerOrig"));
++                    if (itemstack.tag.hasKey("SkullOwnerOrig")) {
++                        owner.map.put("Id", itemstack.tag.map.get("SkullOwnerOrig"));
 +                        itemstack.tag.remove("SkullOwnerOrig");
 +                    }
 +                }