diff --git a/Mage.Sets/src/mage/cards/o/Octomancer.java b/Mage.Sets/src/mage/cards/o/Octomancer.java
index c23c5e50ee3..4431fd51f9e 100644
--- a/Mage.Sets/src/mage/cards/o/Octomancer.java
+++ b/Mage.Sets/src/mage/cards/o/Octomancer.java
@@ -45,7 +45,7 @@ public final class Octomancer extends CardImpl {
 
         // At the beginning of each end step, create a token that's a copy of target creature token that entered the battlefield this turn.
         Ability ability = new BeginningOfEndStepTriggeredAbility(
-                new CreateTokenCopyTargetEffect(), TargetController.YOU, false
+                new CreateTokenCopyTargetEffect(), TargetController.ANY, false
         );
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/s/StockingThePantry.java b/Mage.Sets/src/mage/cards/s/StockingThePantry.java
index ead3bcf1a34..66af3dab5b8 100644
--- a/Mage.Sets/src/mage/cards/s/StockingThePantry.java
+++ b/Mage.Sets/src/mage/cards/s/StockingThePantry.java
@@ -68,7 +68,7 @@ class StockingThePantryTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (!event.getData().equals(CounterType.P1P1.getName())) {
+        if (!event.getData().equals(CounterType.P1P1.getName()) || !isControlledBy(event.getPlayerId())) {
             return false;
         }
         Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());