diff --git a/cpp/tiledmap.cc b/cpp/tiledmap.cc
index a59cea4..acf9daf 100644
--- a/cpp/tiledmap.cc
+++ b/cpp/tiledmap.cc
@@ -278,6 +278,14 @@ bool TiledMap::CalcCurrPos(std::vector<int>& path_points, int old_pos_x, int old
     if (path_points.size() < 2) {
         return false;
     }
+
+    StagePoint* sp_terminal = GetStageObject(path_points[path_points.size()-1]);
+    if (sp_terminal && old_pos_x == sp_terminal->x && old_pos_y == sp_terminal->y) {
+        curr_pos_x = old_pos_x;
+        curr_pos_y = old_pos_y;
+        return true;
+    }
+
     std::vector<std::string> stage_path_list;
     {
         std::string path_point;