diff --git a/src/otclient/core/localplayer.cpp b/src/otclient/core/localplayer.cpp
index f3dd113b..50f29ac1 100644
--- a/src/otclient/core/localplayer.cpp
+++ b/src/otclient/core/localplayer.cpp
@@ -67,6 +67,9 @@ void LocalPlayer::cancelWalk(Otc::Direction direction)
 
 bool LocalPlayer::canWalk(Otc::Direction direction)
 {
+    if(m_walking)
+        return false;
+
     Position newPos = m_position + Position::getPositionFromDirection(direction);
     TilePtr tile = g_map.getTile(newPos);
     if(!tile->isWalkable()) {
@@ -75,5 +78,5 @@ bool LocalPlayer::canWalk(Otc::Direction direction)
         return false;
     }
 
-    return !m_clientWalking;
+    return true;
 }
diff --git a/src/otclient/core/tile.cpp b/src/otclient/core/tile.cpp
index 9f85c7a0..ca84a67b 100644
--- a/src/otclient/core/tile.cpp
+++ b/src/otclient/core/tile.cpp
@@ -86,7 +86,7 @@ void Tile::draw(const Point& p)
     for(const ThingPtr& thing : m_things) {
         const ThingType& type = thing->getType();
         if(type.isOnTop)
-            thing->draw(p.x - m_drawElevation, p.y - m_drawElevation);
+            thing->draw(p.x, p.y);
     }
 }