diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
index 52ff6e259..5dab33adf 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
@@ -91,7 +91,7 @@ public class ScrollOfTeleportation extends Scroll {
 			return;
 		}
 		
-		int count = 10;
+		int count = 20;
 		int pos;
 		do {
 			pos = Dungeon.level.randomRespawnCell( ch );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java
index 0a962971f..35c30eda2 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java
@@ -45,14 +45,14 @@ public class PhaseShift extends TargetedSpell {
 		if (ch == hero){
 			ScrollOfTeleportation.teleportHero(curUser);
 		} else if (ch != null) {
-			int count = 10;
+			int count = 20;
 			int pos;
 			do {
 				pos = Dungeon.level.randomRespawnCell( hero );
 				if (count-- <= 0) {
 					break;
 				}
-			} while (pos == -1);
+			} while (pos == -1 || Dungeon.level.secret[pos]);
 			
 			if (pos == -1 || Dungeon.bossLevel()) {
 				
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Displacing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Displacing.java
index b71447133..173234ae0 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Displacing.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Displacing.java
@@ -39,14 +39,14 @@ public class Displacing extends Weapon.Enchantment {
 
 		float procChance = 1/12f * procChanceMultiplier(attacker);
 		if (Random.Float() < procChance && !defender.properties().contains(Char.Property.IMMOVABLE)){
-			int count = 10;
+			int count = 20;
 			int newPos;
 			do {
 				newPos = Dungeon.level.randomRespawnCell( defender );
 				if (count-- <= 0) {
 					break;
 				}
-			} while (newPos == -1);
+			} while (newPos == -1 || Dungeon.level.secret[newPos]);
 
 			if (newPos != -1 && !Dungeon.bossLevel()) {
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java
index 9f7a849a3..0d53f5456 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java
@@ -54,14 +54,14 @@ public class TeleportationTrap extends Trap {
 			if (ch instanceof Hero) {
 				ScrollOfTeleportation.teleportHero((Hero) ch);
 			} else {
-				int count = 10;
+				int count = 20;
 				int pos;
 				do {
 					pos = Dungeon.level.randomRespawnCell( ch );
 					if (count-- <= 0) {
 						break;
 					}
-				} while (pos == -1);
+				} while (pos == -1 || Dungeon.level.secret[pos]);
 				
 				if (pos == -1 || Dungeon.bossLevel()) {
 					
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java
index 47d664082..9f82c9835 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java
@@ -60,14 +60,14 @@ public class WarpingTrap extends Trap {
 				Dungeon.observe();
 				
 			} else {
-				int count = 10;
+				int count = 20;
 				int pos;
 				do {
 					pos = Dungeon.level.randomRespawnCell( ch );
 					if (count-- <= 0) {
 						break;
 					}
-				} while (pos == -1);
+				} while (pos == -1 || Dungeon.level.secret[pos]);
 				
 				if (pos == -1 || Dungeon.bossLevel()) {
 					
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java
index 0af1045f7..50793add3 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java
@@ -77,14 +77,14 @@ public class Fadeleaf extends Plant {
 
 			if (!Dungeon.bossLevel()) {
 
-				int count = 10;
+				int count = 20;
 				int newPos;
 				do {
 					newPos = Dungeon.level.randomRespawnCell(ch);
 					if (count-- <= 0) {
 						break;
 					}
-				} while (newPos == -1);
+				} while (newPos == -1 || Dungeon.level.secret[newPos]);
 
 				if (newPos != -1) {