diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs b/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
index 4e445beff..611a00f8d 100644
--- a/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
+++ b/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
@@ -23,5 +23,8 @@ namespace Dalamud.Game.ClientState.Objects.Types
         /// Gets the BattleNpc <see cref="BattleNpcSubKind" /> of this BattleNpc.
         /// </summary>
         public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
+
+        /// <inheritdoc/>
+        public override uint TargetObjectId => this.Struct->BattleNpcTargetObjectId;
     }
 }
diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
index a7dd836d6..121dae753 100644
--- a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
+++ b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
@@ -33,6 +33,6 @@ namespace Dalamud.Game.ClientState.Objects.SubKinds
         /// <summary>
         /// Gets the target actor ID of the PlayerCharacter.
         /// </summary>
-        public override uint TargetObjectId => this.Struct->Character.GameObject.TargetObjectID;
+        public override uint TargetObjectId => this.Struct->Character.PlayerTargetObjectID;
     }
 }
diff --git a/Dalamud/Game/ClientState/Objects/Types/Character.cs b/Dalamud/Game/ClientState/Objects/Types/Character.cs
index 17a1ec6f3..ff412d8e5 100644
--- a/Dalamud/Game/ClientState/Objects/Types/Character.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/Character.cs
@@ -86,7 +86,7 @@ namespace Dalamud.Game.ClientState.Objects.Types
         /// <summary>
         /// Gets the target object ID of the character.
         /// </summary>
-        public override uint TargetObjectId => this.Struct->GameObject.TargetObjectID;
+        public override uint TargetObjectId => this.Struct->TargetObjectID;
 
         /// <summary>
         /// Gets the name ID of the character.
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 74556bdfe..47802afd0 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 74556bdfe469ed66ba77d613186a0c3d6eeda88d
+Subproject commit 47802afd09afe2cf3bd4c92bedc433c8a5bb9ab3