diff --git a/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapWrapper.java b/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapWrapper.java
index c2b6edd..f8dd0d6 100644
--- a/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapWrapper.java
+++ b/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapWrapper.java
@@ -168,7 +168,7 @@ public class MapWrapper extends AbstractMapWrapper {
             String inventoryMenuName;
             if (supports(21)) {
                 //1.21.5 = bQ, 1.21 - 1.21.4 = cc
-                inventoryMenuName = supports(21, 4) ? "bQ" : "cc";
+                inventoryMenuName = supports(21, 5) ? "bQ" : "cc";
             } else if (supports(20)) {
                 //1.20.5 = cb, 1.20.2 - 1.20.4 = bR, 1.20(.1) = bQ
                 inventoryMenuName = supports(20, 4) ? "cb" : supports(20, 2) ? "bR" : "bQ";
@@ -293,7 +293,7 @@ public class MapWrapper extends AbstractMapWrapper {
 
             //1.20.5 uses new NBT compound system
             if (supports(20, 4)) {
-                Object mapIdComponent = ReflectionUtil.getDeclaredField(getNMSClass("core.component", "DataComponents"), supports(21, 4) ? "M" : supports(21, 2) ? "L" : "B"); //1.21.2+ uses L, otherwise B
+                Object mapIdComponent = ReflectionUtil.getDeclaredField(getNMSClass("core.component", "DataComponents"), supports(21, 5) ? "M" : supports(21, 2) ? "L" : "B"); //1.21.2+ uses L, otherwise B
                 Object mapId1 = ReflectionUtil.callConstructor(getNMSClass("world.level.saveddata.maps", "MapId"), mapId);
 
                 // Use generic reflection because of generics