diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java
index 6a07173cf..c21376754 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java
@@ -32,7 +32,7 @@ public abstract class AbstractAttachable extends AbstractLotroCardBlueprint {
         return _possessionClass;
     }
 
-    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self) {
+    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self, PhysicalCard attachedTo) {
         return false;
     }
 
@@ -43,13 +43,13 @@ public abstract class AbstractAttachable extends AbstractLotroCardBlueprint {
                     public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
                         PossessionClass possessionClass = getPossessionClass();
                         if (possessionClass != null) {
-                            boolean extraPossessionClass = isExtraPossessionClass(game, self);
+                            boolean extraPossessionClass = isExtraPossessionClass(game, self, physicalCard);
                             List<PhysicalCard> attachedCards = game.getGameState().getAttachedCards(physicalCard);
                             Collection<PhysicalCard> matchingClassPossessions = Filters.filter(attachedCards, gameState, modifiersQuerying, Filters.or(CardType.POSSESSION, CardType.ARTIFACT), possessionClass);
                             if (matchingClassPossessions.size() > 1)
                                 return false;
                             if (!extraPossessionClass && matchingClassPossessions.size() == 1 &&
-                                    !((AbstractAttachable) matchingClassPossessions.iterator().next().getBlueprint()).isExtraPossessionClass(game, self))
+                                    !((AbstractAttachable) matchingClassPossessions.iterator().next().getBlueprint()).isExtraPossessionClass(game, self, physicalCard))
                                 return false;
                         }
                         return true;
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java
index a679159c6..6702da893 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java
@@ -48,7 +48,7 @@ public class Card1_216 extends AbstractAttachable {
     }
 
     @Override
-    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self) {
+    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self, PhysicalCard attachedTo) {
         return true;
     }
 
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_010.java
index d6020bac2..4c881b7fb 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_010.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_010.java
@@ -30,7 +30,7 @@ public class Card2_010 extends AbstractAttachableFPPossession {
     }
 
     @Override
-    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self) {
+    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self, PhysicalCard attachedTo) {
         return true;
     }
 
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_032.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_032.java
index dd434c9f6..82e49aee2 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_032.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_032.java
@@ -32,7 +32,7 @@ public class Card2_032 extends AbstractAttachableFPPossession {
     }
 
     @Override
-    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self) {
+    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self, PhysicalCard attachedTo) {
         return true;
     }
 
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_050.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_050.java
index 1f7887b9c..f93342b6d 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_050.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_050.java
@@ -33,7 +33,7 @@ public class Card2_050 extends AbstractAttachable {
     }
 
     @Override
-    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self) {
+    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self, PhysicalCard attachedTo) {
         return true;
     }
 
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/elven/Card9_017.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/elven/Card9_017.java
index ef8f90391..7f4ada790 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/elven/Card9_017.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/elven/Card9_017.java
@@ -35,9 +35,8 @@ public class Card9_017 extends AbstractAttachableFPPossession {
     }
 
     @Override
-    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self) {
-        PhysicalCard to = self.getAttachedTo();
-        return (to != null && to.getBlueprint().getName().equals("Aragorn"));
+    public boolean isExtraPossessionClass(LotroGame game, PhysicalCard self, PhysicalCard attachedTo) {
+        return (attachedTo.getBlueprint().getName().equals("Aragorn"));
     }
 
     @Override