diff --git a/.gitattributes b/.gitattributes
index f867dee8c1e..e32e4d5cf44 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10856,6 +10856,7 @@ res/cardsfolder/s/stonehewer_giant.txt -text
 res/cardsfolder/s/stonehewer_giant_avatar.txt -text
 res/cardsfolder/s/stonehorn_chanter.txt -text
 res/cardsfolder/s/stonehorn_dignitary.txt -text
+res/cardsfolder/s/stoneshaker_shaman.txt -text
 res/cardsfolder/s/stonewood_invocation.txt svneol=native#text/plain
 res/cardsfolder/s/stonewood_invoker.txt svneol=native#text/plain
 res/cardsfolder/s/stonework_puma.txt svneol=native#text/plain
diff --git a/res/cardsfolder/c/copperhoof_vorrac.txt b/res/cardsfolder/c/copperhoof_vorrac.txt
index 86a8a65a31e..427c9e0d617 100644
--- a/res/cardsfolder/c/copperhoof_vorrac.txt
+++ b/res/cardsfolder/c/copperhoof_vorrac.txt
@@ -4,7 +4,7 @@ Types:Creature Boar Beast
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each untapped permanent your opponents control.
 SVar:X:Count$Valid Permanent.untapped+OppCtrl
-SVar:AITapDown:Permanent
+SVar:AITapDown:Permanent.OppCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/copperhoof_vorrac.jpg
 Oracle:Copperhoof Vorrac gets +1/+1 for each untapped permanent your opponents control.
\ No newline at end of file
diff --git a/res/cardsfolder/s/stoneshaker_shaman.txt b/res/cardsfolder/s/stoneshaker_shaman.txt
new file mode 100644
index 00000000000..c8216597f4c
--- /dev/null
+++ b/res/cardsfolder/s/stoneshaker_shaman.txt
@@ -0,0 +1,10 @@
+Name:Stoneshaker Shaman
+ManaCost:2 R
+Types:Creature Human Shaman
+PT:1/1
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of each player's end step, that player sacrifices an untapped land.
+SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Land.untapped | Defined$ TriggeredPlayer | SpellDescription$ Sacrifice an untapped land.
+SVar:AITapDown:Land
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/stoneshaker_shaman.jpg
+Oracle:At the beginning of each player's end step, that player sacrifices an untapped land.
\ No newline at end of file
diff --git a/src/main/java/forge/game/ai/ComputerUtil.java b/src/main/java/forge/game/ai/ComputerUtil.java
index b4618318b4d..7ad6a325b37 100644
--- a/src/main/java/forge/game/ai/ComputerUtil.java
+++ b/src/main/java/forge/game/ai/ComputerUtil.java
@@ -1152,9 +1152,9 @@ public class ComputerUtil {
             return false;
         }
         if (abCost.hasTapCost()) {
-            for (Card c : ai.getOpponent().getCardsIn(ZoneType.Battlefield)) {
+            for (Card c : ai.getGame().getCardsIn(ZoneType.Battlefield)) {
                 if (c.hasSVar("AITapDown")) {
-                    if (source.isValid(c.getSVar("AITapDown"), ai, source)) {
+                    if (source.isValid(c.getSVar("AITapDown"), c.getController(), c)) {
                         return true;
                     }
                 }