diff --git a/server/gameserver/precompile.h b/server/gameserver/precompile.h
index 3a59e32d..eb681357 100644
--- a/server/gameserver/precompile.h
+++ b/server/gameserver/precompile.h
@@ -1,14 +1,11 @@
 #pragma once
 
 #include <a8/a8.h>
-#include <a8/vec2.h>
-#include <a8/vec3.h>
+#include <f8/f8.h>
 
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 
-#include <f8/f8.h>
-
 #include "constant.h"
 #include "constant_export.h"
 #include "mt/Forward.h"
diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc
index fb52ec03..fcd4c764 100644
--- a/server/gameserver/roomobstacle.cc
+++ b/server/gameserver/roomobstacle.cc
@@ -817,12 +817,12 @@ void RoomObstacle::ActiveMedicalStation()
                       if (master.Get()->team_id == hum->team_id &&
                           !hum->dead
                           ) {
-                          if (Collision::CheckCC
+                          if (Collision::CheckCB
                               (
-                               this
-                               SkillHelper::GetYlzRange(skill_meta),
                                hum,
-                               hum->GetRadius()
+                               hum->GetRadius(),
+                               this,
+                               SkillHelper::GetYlzRange(skill_meta)
                                )) {
                               target_list.insert(hum);
                           }
diff --git a/server/gameserver/types.cc b/server/gameserver/types.cc
index 689c0b08..b25820a6 100644
--- a/server/gameserver/types.cc
+++ b/server/gameserver/types.cc
@@ -2,17 +2,22 @@
 
 #include <math.h>
 
+#include <glm/gtc/matrix_transform.hpp>
+
 #include "human.h"
 #include "glmhelper.h"
 
 float Position::Distance2D2(const Position& pos) const
 {
-    return pos.ToVec2().Distance(ToVec2());
+    glm::vec2 v1 = glm::vec2(x, z);
+    glm::vec2 v2 = glm::vec2(pos.x, pos.z);
+    return glm::length(v2 - v1);
 }
 
 float Position::ManhattanDistance2D(const Position& target_pos) const
 {
-    return ToVec2().ManhattanDistance(target_pos.ToVec2());
+    float distance = std::fabs(x - target_pos.x) + std::fabs(z - target_pos.y);
+    return distance;
 }
 
 void Position::FromGlmVec3(const glm::vec3 v)