diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java
index 829238e98..c5dd20643 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java
@@ -57,7 +57,7 @@ public class FreePeoplePlayerAssignsMinionsGameProcess implements GameProcess {
                                         public void decisionMade(String result) throws DecisionResultInvalidException {
                                             Map<PhysicalCard, Set<PhysicalCard>> assignments = getAssignmentsBasedOnResponse(result);
 
-                                            Set<PhysicalCard> unassignedMinions = new HashSet<PhysicalCard>(minions);
+                                            Set<PhysicalCard> unassignedMinions = new HashSet<PhysicalCard>(Filters.filterActive(gameState, game.getModifiersQuerying(), CardType.MINION));
                                             // Validate minion count (Defender)
                                             for (PhysicalCard freeCard : assignments.keySet()) {
                                                 Set<PhysicalCard> minionsAssigned = assignments.get(freeCard);
@@ -76,7 +76,7 @@ public class FreePeoplePlayerAssignsMinionsGameProcess implements GameProcess {
                                         }
                                     });
                         } else {
-                            _leftoverMinions = new HashSet<PhysicalCard>();
+                            _leftoverMinions = new HashSet<PhysicalCard>(Filters.filterActive(gameState, game.getModifiersQuerying(), CardType.MINION));
                         }
                     }
                 });
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 54f8a258e..0cee30ffe 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
@@ -7,6 +7,7 @@ and discard).
 if he/she wants to prevent it.
 - "Morgul Regiment" now allows to exert the same companion multiple times.
 - "Parapet" activated ability now requires to spot 2 ROHAN Man, rather than just 1.
+- "Bill Ferny" and other minions not assignable by FP player now should be assignable by Shadow player correctly.
 
 <b>16 Mar. 2012</b>
 - When "Mountain-troll" is played with discarding 5 minions, now it should properly gain Fierce.