diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index 5eec819f..890e97b4 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -1682,7 +1682,10 @@ void mapclass::loadlevel(int rx, int ry)
 			//If entity is in this room, create it
 			int tsx=(edentity[edi].x-(edentity[edi].x%40))/40;
 			int tsy=(edentity[edi].y-(edentity[edi].y%30))/30;
-			if(tsx==rx-100 && tsy==ry-100){
+			if (tsx != rx-100 || tsy != ry-100)
+			{
+				continue;
+			}
 			switch(edentity[edi].t){
 				case 1: //Enemies
 				int bx1, by1, bx2, by2;
@@ -1795,7 +1798,6 @@ void mapclass::loadlevel(int rx, int ry)
 				break;
 			}
 			}
-			}
 
 		//do the appear/remove roomname here
 		break;