diff --git a/Anamnesis/Memory/ActorBasicMemory.cs b/Anamnesis/Memory/ActorBasicMemory.cs
index c8f7f4b4..b77b2a77 100644
--- a/Anamnesis/Memory/ActorBasicMemory.cs
+++ b/Anamnesis/Memory/ActorBasicMemory.cs
@@ -3,14 +3,13 @@
 
 namespace Anamnesis.Memory;
 
-using System;
-using System.Collections.Generic;
 using Anamnesis.Actor;
-using Anamnesis.Services;
 using Anamnesis.Styles;
 using Anamnesis.Utils;
 using FontAwesome.Sharp;
 using PropertyChanged;
+using System;
+using System.Collections.Generic;
 
 public class ActorBasicMemory : MemoryBase
 {
@@ -45,7 +44,7 @@ public enum RenderModes : uint
 	public string? Nickname { get; set; }
 
 	[DependsOn(nameof(ObjectIndex))]
-	public virtual bool IsGPoseActor => this.ObjectIndex >= 200 && this.ObjectIndex < 244;
+	public virtual bool IsGPoseActor => this.ObjectIndex >= 200 && this.ObjectIndex < 440;
 
 	[DependsOn(nameof(IsGPoseActor))]
 	public bool IsOverworldActor => !this.IsGPoseActor;
diff --git a/Anamnesis/Services/ActorService.cs b/Anamnesis/Services/ActorService.cs
index cfac41df..cdfcb5a2 100644
--- a/Anamnesis/Services/ActorService.cs
+++ b/Anamnesis/Services/ActorService.cs
@@ -18,7 +18,7 @@ public class ActorService : ServiceBase<ActorService>
 	private const int TickDelay = 10;
 	private const int ActorTableSize = 819;
 	private const int GPoseIndexStart = 200;
-	private const int GPoseIndexEnd = 244;
+	private const int GPoseIndexEnd = 440;
 	private const int OverworldPlayerIndex = 0;
 	private const int GPosePlayerIndex = 201;
 
diff --git a/Anamnesis/Services/TargetService.cs b/Anamnesis/Services/TargetService.cs
index 55370df0..5a627edf 100644
--- a/Anamnesis/Services/TargetService.cs
+++ b/Anamnesis/Services/TargetService.cs
@@ -13,6 +13,7 @@ namespace Anamnesis;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading.Tasks;
 using XivToolsWpf;
 
@@ -120,7 +121,7 @@ public static void UnpinActor(PinnedActor actor)
 
 	public static PinnedActor? GetPinned(ActorBasicMemory actor)
 	{
-		foreach (PinnedActor pinned in TargetService.Instance.PinnedActors)
+		foreach (PinnedActor pinned in TargetService.Instance.PinnedActors.ToList())
 		{
 			if (pinned.Memory == null)
 				continue;