diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GatewayTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GatewayTrap.java
index 6c2de2762..a317f1e72 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GatewayTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GatewayTrap.java
@@ -42,18 +42,14 @@ public class GatewayTrap extends Trap {
 					}
 				}
 				Heap heap = Dungeon.level.heaps.get(pos + i);
-				if (heap != null){
+				if (heap != null && heap.type == Heap.Type.HEAP){
 					int cell = Dungeon.level.randomRespawnCell( null );
 
 					Item item = heap.pickUp();
 
 					if (cell != -1) {
-						Heap dropped = Dungeon.level.drop( item, cell );
-						dropped.type = heap.type;
-						dropped.sprite.view( dropped );
-						telePos = cell;
+						Dungeon.level.drop( item, cell );
 						break;
-
 					}
 				}
 			}
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 5c8ba75bb..e44011a49 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
@@ -57,16 +57,13 @@ public class TeleportationTrap extends Trap {
 				}
 			}
 			Heap heap = Dungeon.level.heaps.get(pos + i);
-			if (heap != null){
+			if (heap != null && heap.type == Heap.Type.HEAP){
 				int cell = Dungeon.level.randomRespawnCell( null );
 
 				Item item = heap.pickUp();
 
 				if (cell != -1) {
-					Heap dropped = Dungeon.level.drop( item, cell );
-					dropped.type = heap.type;
-					dropped.sprite.view( dropped );
-
+					Dungeon.level.drop( item, cell );
 				}
 			}
 		}