diff --git a/Mage.Sets/src/mage/sets/commander/Stranglehold.java b/Mage.Sets/src/mage/sets/commander/Stranglehold.java
index e129b6c3108..ae748538b58 100644
--- a/Mage.Sets/src/mage/sets/commander/Stranglehold.java
+++ b/Mage.Sets/src/mage/sets/commander/Stranglehold.java
@@ -30,6 +30,7 @@ package mage.sets.commander;
 import java.util.UUID;
 import mage.MageObject;
 import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.cards.CardImpl;
@@ -37,6 +38,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
@@ -53,10 +55,10 @@ public class Stranglehold extends CardImpl {
         this.expansionSetCode = "CMD";
 
         // Your opponents can't search libraries.
-        this.getSpellAbility().addEffect(new OpponentsCantSearchLibarariesEffect());
-        
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpponentsCantSearchLibarariesEffect()));
+
         // If an opponent would begin an extra turn, that player skips that turn instead.
-        this.getSpellAbility().addEffect(new StrangleholdSkipExtraTurnsEffect());
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StrangleholdSkipExtraTurnsEffect()));
     }
 
     public Stranglehold(final Stranglehold card) {
@@ -103,7 +105,7 @@ class OpponentsCantSearchLibarariesEffect extends ContinuousRuleModifyingEffectI
     public boolean checksEventType(GameEvent event, Game game) {
         return EventType.SEARCH_LIBRARY.equals(event.getType());
     }
-    
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         Player controller = game.getPlayer(source.getControllerId());
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantSearchTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantSearchTest.java
new file mode 100644
index 00000000000..f823f473314
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantSearchTest.java
@@ -0,0 +1,66 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.rules;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class CantSearchTest extends CardTestPlayerBase {
+
+    /**
+     * Stranglehold doesn´t stop your opponents from searching libraries, at the
+     * moment it doesn´t work at all. Opponents were able to search their and my
+     * library in multiple gammes.
+     */
+    @Test
+    public void testStranglehold() {
+        // Your opponents can't search libraries.
+        // If an opponent would begin an extra turn, that player skips that turn instead.
+        addCard(Zone.BATTLEFIELD, playerB, "Stranglehold");
+
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
+        // Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library.
+        addCard(Zone.HAND, playerA, "Rampant Growth", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rampant Growth");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, "Rampant Growth", 1);
+        assertPermanentCount(playerA, 2); // only the two forests
+
+    }
+
+}