diff --git a/src/combat.cpp b/src/combat.cpp
index 11b32ee..05dda4e 100644
--- a/src/combat.cpp
+++ b/src/combat.cpp
@@ -175,7 +175,11 @@ ReturnValue Combat::canDoCombat(Creature* caster, Tile* tile, bool aggressive)
 		return RETURNVALUE_NOTENOUGHROOM;
 	}
 
-	if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKSOLID) && tile->hasProperty(CONST_PROP_UNLAY)) {
+	/*if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKSOLID) && tile->hasProperty(CONST_PROP_UNLAY)) {
+		return RETURNVALUE_NOTENOUGHROOM;
+	}*/
+
+	if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKPATH)) {
 		return RETURNVALUE_NOTENOUGHROOM;
 	}
 
diff --git a/src/spells.cpp b/src/spells.cpp
index 9f391fd..4592a24 100644
--- a/src/spells.cpp
+++ b/src/spells.cpp
@@ -692,7 +692,7 @@ bool Spell::playerRuneSpellCheck(Player* player, const Position& toPos)
 		player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM);
 		g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF);
 		return false;
-	} else if (blockingSolid && tile->hasFlag(TILESTATE_BLOCKSOLID)) {
+	} else if (blockingSolid && tile->hasProperty(CONST_PROP_BLOCKPROJECTILE) && tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKSOLID)) {
 		player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM);
 		g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF);
 		return false;