diff --git a/Source/path.cpp b/Source/path.cpp
index 39906fe5f..70970c4f4 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -269,9 +269,12 @@ BOOL path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy)
 PATHNODE *path_get_node1(int dx, int dy)
 {
 	PATHNODE *result = path_2_nodes->NextNode;
-	while (result != NULL && (result->x != dx || result->y != dy))
+	while (result != NULL) {
+		if (result->x == dx && result->y == dy)
+			return result;
 		result = result->NextNode;
-	return result;
+	}
+	return NULL;
 }
 
 /**