diff --git a/src/map_generation/map/MapBuilder.java b/src/map_generation/map/MapBuilder.java
index b696ced32c1d02fe48e21f147dc68aa55b5a6b70..c23b473ce2e45da7de8b8f70afe18f659d0ebe21 100644
--- a/src/map_generation/map/MapBuilder.java
+++ b/src/map_generation/map/MapBuilder.java
@@ -164,7 +164,8 @@ public final class MapBuilder implements Serializable{
 			int jj=rooms.get(room).j1+r.nextInt(rooms.get(room).width);
 			int posY=ii*Point.TileScale;
 	        int posX=jj*Point.TileScale;
-			if(tb[jj][ii].getType() != TileType.WATER) entities.add(SpeciesArray.create(posX,posY,100,"Ronflex","Monster "+i));
+			//if(tb[jj][ii].getType() != TileType.WATER) entities.add(SpeciesArray.create(posX,posY,100,"Ronflex","Monster "+i));
+	        if(SpeciesArray.canSpawn(Point.construct(posX, posY), "Ronflex")) entities.add(SpeciesArray.create(posX,posY,100,"Ronflex","Monster "+i));
 		}
 	}
 	
diff --git a/src/map_generation/tests/MapTests.java b/src/map_generation/tests/MapTests.java
index 5fe02ec098baa9662906730b533e129ade593cce..6677dad542b99586db7851e7fb4450f1ab6491bc 100644
--- a/src/map_generation/tests/MapTests.java
+++ b/src/map_generation/tests/MapTests.java
@@ -32,5 +32,5 @@ public class MapTests {
 		Map map = SurfacesMapGeneration.roomsRandomGeneration(20, 500);
 		assertFalse("The player has spawn on water !", map.getTileAt(map.getPositionPlayerStart()).getType() == TileType.WATER);
 	}
-
+	
 }