diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
index 4f4451035..8047f7d31 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
@@ -203,8 +203,10 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_15, Serve
             NumberTag leastTag = attribute.getNumberTag("UUIDLeast");
             NumberTag mostTag = attribute.getNumberTag("UUIDMost");
             if (leastTag != null && mostTag != null) {
-                int[] uuidIntArray = UUIDUtil.toIntArray(leastTag.asLong(), mostTag.asLong());
+                int[] uuidIntArray = UUIDUtil.toIntArray(mostTag.asLong(), leastTag.asLong());
                 attribute.put("UUID", new IntArrayTag(uuidIntArray));
+                attribute.remove("UUIDLeast");
+                attribute.remove("UUIDMost");
             }
         }
     }
@@ -223,6 +225,7 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_15, Serve
                 UUID uuid = UUIDUtil.fromIntArray(uuidTag.getValue());
                 attribute.putLong("UUIDLeast", uuid.getLeastSignificantBits());
                 attribute.putLong("UUIDMost", uuid.getMostSignificantBits());
+                attribute.remove("UUID");
             }
         }
     }