diff --git a/Source/msg.cpp b/Source/msg.cpp
index 91f6aec91..ce578df00 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -1254,7 +1254,7 @@ size_t OnGotoGetItem(const TCmdLocParam1 &message, Player &player)
 {
 	const Point position { message.x, message.y };
 
-	if (gbBufferMsgs != 1 && player.isOnActiveLevel() && InDungeonBounds(position) && Swap16LE(message.wParam1) < MaxDeltaItems + 1) {
+	if (gbBufferMsgs != 1 && player.isOnActiveLevel() && InDungeonBounds(position) && Swap16LE(message.wParam1) < MAXITEMS + 1) {
 		MakePlrPath(player, position, false);
 		player.destAction = ACTION_PICKUPITEM;
 		player.destParam1 = Swap16LE(message.wParam1);
@@ -1269,7 +1269,7 @@ bool IsGItemValid(const TCmdGItem &message)
 		return false;
 	if (message.bPnum >= Players.size())
 		return false;
-	if (message.bCursitem >= MaxDeltaItems + 1)
+	if (message.bCursitem >= MAXITEMS + 1)
 		return false;
 	if (!IsValidLevelForMultiplayer(message.bLevel))
 		return false;
@@ -1506,7 +1506,7 @@ size_t OnGotoAutoGetItem(const TCmdLocParam1 &message, Player &player)
 	const Point position { message.x, message.y };
 
 	const uint16_t itemIdx = Swap16LE(message.wParam1);
-	if (gbBufferMsgs != 1 && player.isOnActiveLevel() && InDungeonBounds(position) && itemIdx < MaxDeltaItems + 1) {
+	if (gbBufferMsgs != 1 && player.isOnActiveLevel() && InDungeonBounds(position) && itemIdx < MAXITEMS + 1) {
 		MakePlrPath(player, position, false);
 		player.destAction = ACTION_PICKUPAITEM;
 		player.destParam1 = itemIdx;