diff --git a/res/cardsfolder/a/alchemists_refuge.txt b/res/cardsfolder/a/alchemists_refuge.txt
index 10ba6b1a637..1bbeb2d7659 100644
--- a/res/cardsfolder/a/alchemists_refuge.txt
+++ b/res/cardsfolder/a/alchemists_refuge.txt
@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ Effect | Cost$ U G T | Name$ Refuge Effect | StaticAbilities$ QuickSpell | SpellDescription$ Until end of turn, you may cast nonland cards as though they had flash.
-SVar:QuickSpell:Mode$ Continuous | Affected$ Card.nonLand+YouCtrl | AddHiddenKeyword$ HIDDEN Flash | AffectedZone$ Exile,Graveyard,Hand,Library
+SVar:QuickSpell:Mode$ Continuous | Affected$ You | AddKeyword$ You may cast nonland cards as though they had flash. | Description$ You may cast nonland cards as though they had flash.
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/l/leyline_of_anticipation.txt b/res/cardsfolder/l/leyline_of_anticipation.txt
index bdc83f9d7a9..7b69afdffd8 100644
--- a/res/cardsfolder/l/leyline_of_anticipation.txt
+++ b/res/cardsfolder/l/leyline_of_anticipation.txt
@@ -2,7 +2,7 @@ Name:Leyline of Anticipation
 ManaCost:2 U U
 Types:Enchantment
 Text:If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
-S:Mode$ Continuous | Affected$ Card.nonLand+YouCtrl | AddHiddenKeyword$ HIDDEN Flash | AffectedZone$ Exile,Graveyard,Hand,Library | Description$ You may cast nonland cards as though they had flash. (You may cast them any time you could cast an instant.)
+S:Mode$ Continuous | Affected$ You | AddKeyword$ You may cast nonland cards as though they had flash. | Description$ You may cast nonland cards as though they had flash.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_anticipation.jpg
diff --git a/res/cardsfolder/v/vedalken_orrery.txt b/res/cardsfolder/v/vedalken_orrery.txt
index 96bf4d01c43..46a73de7f7b 100644
--- a/res/cardsfolder/v/vedalken_orrery.txt
+++ b/res/cardsfolder/v/vedalken_orrery.txt
@@ -2,7 +2,7 @@ Name:Vedalken Orrery
 ManaCost:4
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Card.nonLand+YouCtrl | AffectedZone$ Exile,Graveyard,Hand,Library | AddHiddenKeyword$ HIDDEN Flash | Description$ You may cast nonland cards as though they had flash
+S:Mode$ Continuous | Affected$ You | AddKeyword$ You may cast nonland cards as though they had flash. | Description$ You may cast nonland cards as though they had flash.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vedalken_orrery.jpg
 SetInfo:5DN|Rare|http://magiccards.info/scans/en/5dn/163.jpg
diff --git a/src/main/java/forge/card/spellability/Spell.java b/src/main/java/forge/card/spellability/Spell.java
index f6296b7804b..b129ffa57a8 100644
--- a/src/main/java/forge/card/spellability/Spell.java
+++ b/src/main/java/forge/card/spellability/Spell.java
@@ -93,10 +93,14 @@ public abstract class Spell extends SpellAbility implements java.io.Serializable
 
         final Card card = this.getSourceCard();
 
-        final Player activator = this.getActivatingPlayer();
+        Player activator = this.getActivatingPlayer();
+        if (activator == null) {
+            activator = this.getSourceCard().getController();
+        }
 
-        if (!(card.isInstant() || card.hasKeyword("Flash") || PhaseHandler.canCastSorcery(activator)
-               || this.getRestrictions().isInstantSpeed())) {
+        if (!(card.isInstant() || PhaseHandler.canCastSorcery(activator) || card.hasKeyword("Flash")
+               || this.getRestrictions().isInstantSpeed()
+               || activator.hasKeyword("You may cast nonland cards as though they had flash."))) {
             return false;
         }