diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleUtils.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleUtils.java
index d5601eec4..c382dbef2 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleUtils.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleUtils.java
@@ -70,14 +70,14 @@ public class RuleUtils {
         if (skirmish == null)
             return 0;
 
-        final Evaluator overrideEvaluator = skirmish.getFpStrengthOverrideEvaluator();
-        if (overrideEvaluator != null)
-            return overrideEvaluator.evaluateExpression(game.getGameState(), game.getModifiersQuerying(), null);
-
         PhysicalCard fpChar = skirmish.getFellowshipCharacter();
         if (fpChar == null)
             return 0;
 
+        final Evaluator overrideEvaluator = skirmish.getFpStrengthOverrideEvaluator();
+        if (overrideEvaluator != null)
+            return overrideEvaluator.evaluateExpression(game.getGameState(), game.getModifiersQuerying(), fpChar);
+
         return game.getModifiersQuerying().getStrength(game.getGameState(), fpChar);
     }
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DeckDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DeckDAO.java
index 11d0b7fea..0bd3019f6 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DeckDAO.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DeckDAO.java
@@ -189,8 +189,10 @@ public class DeckDAO {
             String ringBearer = cardsList.get(0);
             String ring = cardsList.get(1);
             final LotroDeck lotroDeck = new LotroDeck();
-            lotroDeck.setRingBearer(ringBearer);
-            lotroDeck.setRing(ring);
+            if (ringBearer.length() > 0)
+                lotroDeck.setRingBearer(ringBearer);
+            if (ring.length() > 0)
+                lotroDeck.setRing(ring);
             for (String blueprintId : cardsList.subList(2, cardsList.size())) {
                 if (_library.getLotroCardBlueprint(blueprintId).getCardType() == CardType.SITE)
                     lotroDeck.addSite(blueprintId);
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 8a5371b5b..c054d84fa 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
@@ -1,6 +1,7 @@
 <pre style="font-size:80%">
 <b>30 Mar. 2012</b>
 - "What Are We Waiting For?" should now skip only one Shadow phase, if player moves more than once.
+- "Final Triumph" should now correctly allow the skirmish to resolve based on Vitality.
 
 <b>28 Mar. 2012</b>
 - "Galadriel, Lady of the Golden Wood" should play the next site correctly now in non-numbered formats.