diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/gondor/Card12_042.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/gondor/Card12_042.java
index 490c4b655..c178035af 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/gondor/Card12_042.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/gondor/Card12_042.java
@@ -50,7 +50,7 @@ public class Card12_042 extends AbstractAttachableFPPossession {
             action.appendCost(
                     new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Culture.GONDOR, Filters.attachedTo(Filters.hasAttached(self))));
             action.appendEffect(
-                    new ReplaceInSkirmishEffect(self, Filters.unboundCompanion, Race.HOBBIT));
+                    new ReplaceInSkirmishEffect(self.getAttachedTo(), Filters.unboundCompanion, Race.HOBBIT));
             return Collections.singletonList(action);
         }
         return null;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index b41a75900..98f7ec109 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -4,6 +4,7 @@
 - Merchant starting filter shows cards only.
 - System messages in Game Hall can now be hidden with a button.
 - Chat in game can now be prevented from auto-scrolling using a button.
+- "Blade of Gondor, Sword of Boromir" now correctly replaces the hobbit with it's bearer in skirmish.
 
 <b>10 Apr. 2012</b>
 - "Momentous Gathering" now can be played if you can spot only one Ent.