diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp
index 44e796044c8..7a79da1cee4 100644
--- a/core/math/a_star.cpp
+++ b/core/math/a_star.cpp
@@ -193,8 +193,7 @@ bool AStar::_solve(Point *begin_point, Point *end_point) {
 
 		Point *n = begin_point->neighbours[i];
 		n->prev_point = begin_point;
-		n->distance = _compute_cost(n->id, begin_point->id);
-		n->distance *= n->weight_scale;
+		n->distance = _compute_cost(begin_point->id, n->id) * n->weight_scale;
 		n->last_pass = pass;
 		open_list.add(&n->list);
 
@@ -238,8 +237,7 @@ bool AStar::_solve(Point *begin_point, Point *end_point) {
 
 			Point *e = p->neighbours[i];
 
-			float distance = _compute_cost(p->id, e->id) + p->distance;
-			distance *= e->weight_scale;
+			float distance = _compute_cost(p->id, e->id) * e->weight_scale + p->distance;
 
 			if (e->last_pass == pass) {
 				//oh this was visited already, can we win the cost?