diff --git a/src/main/java/com/comphenix/protocol/events/AbstractStructure.java b/src/main/java/com/comphenix/protocol/events/AbstractStructure.java
index 6b3703152..f4a210601 100644
--- a/src/main/java/com/comphenix/protocol/events/AbstractStructure.java
+++ b/src/main/java/com/comphenix/protocol/events/AbstractStructure.java
@@ -598,9 +598,7 @@ public StructureModifier<WrappedServerPing> getServerPings() {
      */
     public StructureModifier<List<PlayerInfoData>> getPlayerInfoDataLists() {
         // Convert to and from the ProtocolLib wrapper
-        return structureModifier.withType(
-                Collection.class,
-                BukkitConverters.getListConverter(PlayerInfoData.getConverter()));
+        return getLists(PlayerInfoData.getConverter());
     }
 
     /**
diff --git a/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java b/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java
index 357a20ab1..ee7180072 100644
--- a/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java
+++ b/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java
@@ -848,14 +848,14 @@ public void testPlayerInfoActions() {
                 new WrappedGameProfile(new UUID(0, 0), "system"),
                 null,
                 (WrappedRemoteChatSessionData) null);
-        updatePlayerInfoActions.getPlayerInfoDataLists().write(1, Collections.singletonList(data));
+        StructureModifier<List<PlayerInfoData>> playerInfoDataLists = updatePlayerInfoActions.getPlayerInfoDataLists();
+        Assertions.assertEquals(1, playerInfoDataLists.size());
+        playerInfoDataLists.write(0, Collections.singletonList(data));
 
         Set<EnumWrappers.PlayerInfoAction> readActions = updatePlayerInfoActions.getPlayerInfoActions().read(0);
-        Assertions.assertTrue(readActions.contains(EnumWrappers.PlayerInfoAction.ADD_PLAYER));
-        Assertions.assertTrue(readActions.contains(EnumWrappers.PlayerInfoAction.UPDATE_LATENCY));
-        Assertions.assertTrue(readActions.contains(EnumWrappers.PlayerInfoAction.UPDATE_LISTED));
+        Assertions.assertEquals(actions, readActions);
 
-        Collection<PlayerInfoData> readData = updatePlayerInfoActions.getPlayerInfoDataLists().read(1);
+        Collection<PlayerInfoData> readData = playerInfoDataLists.read(0);
         Assertions.assertEquals(1, readData.size());
 
         PlayerInfoData firstData = readData.iterator().next();