diff --git a/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java b/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java
index 5ef2d5fc45a..7335e0a0227 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java
@@ -1,21 +1,14 @@
 package forge.ai.ability;
 
-import com.google.common.base.Predicate;
 import forge.ai.*;
 import forge.game.Game;
-import forge.game.ability.AbilityUtils;
-import forge.game.ability.ApiType;
 import forge.game.card.Card;
-import forge.game.card.CardCollection;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
-import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
@@ -57,6 +50,11 @@ public class ManifestAi extends SpellAbilityAi {
             } else if (!SpellAbilityAi.isSorcerySpeed(sa)) {
                 return false;
             }
+        } else {
+        	// try to ambush attackers
+        	if (ph.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
+        		return false;
+        	}
         }
 
         final Card source = sa.getHostCard();
diff --git a/forge-gui/res/cardsfolder/s/sultai_emissary.txt b/forge-gui/res/cardsfolder/s/sultai_emissary.txt
index 80c87b3091b..d171dd49606 100644
--- a/forge-gui/res/cardsfolder/s/sultai_emissary.txt
+++ b/forge-gui/res/cardsfolder/s/sultai_emissary.txt
@@ -4,5 +4,6 @@ Types:Creature Zombie Warrior
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigManifest | TriggerDescription$ When CARDNAME dies, manifest the top card of your library. (Put that card onto the battlefield face down as a 2/2 creature. You may turn it face up at any time for its mana cost if it is a creature card.)
 SVar:TrigManifest:DB$ Manifest | Amount$ 1 | Defined$ TopOfLibrary
+SVar:SacMe:4
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sultai_emissary.jpg
 Oracle:When Sultai Emissary dies, manifest the top card of your library. (Put that card onto the battlefield face down as a 2/2 creature. Turn it face up any time for its mana cost if it's a creature card.)