diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RatKingPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RatKingPainter.java
index 27a160c86..a3d2bcb68 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RatKingPainter.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RatKingPainter.java
@@ -48,7 +48,15 @@ public class RatKingPainter extends Painter {
 			addChest( level, i * Level.WIDTH + room.left + 1, door );
 			addChest( level, i * Level.WIDTH + room.right - 1, door );
 		}
-		
+
+		while (true) {
+			Heap chest = level.heaps.get( room.random() );
+			if (chest != null) {
+				chest.type = Heap.Type.MIMIC;
+				break;
+			}
+		}
+
 		RatKing king = new RatKing();
 		king.pos = room.random( 1 );
 		level.mobs.add( king );
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TreasuryPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TreasuryPainter.java
index 97f00a268..b2268555c 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TreasuryPainter.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TreasuryPainter.java
@@ -43,7 +43,7 @@ public class TreasuryPainter extends Painter {
 			do {
 				pos = room.random();
 			} while (level.map[pos] != Terrain.EMPTY || level.heaps.get( pos ) != null);
-			level.drop( new Gold().random(), pos ).type = heapType;
+			level.drop( new Gold().random(), pos ).type = (i == 0 && heapType == Heap.Type.CHEST ? Heap.Type.MIMIC : heapType);
 		}
 		
 		if (heapType == Heap.Type.HEAP) {