diff --git a/Source/path.cpp b/Source/path.cpp
index 70970c4f4..996910ad8 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -283,9 +283,12 @@ PATHNODE *path_get_node1(int dx, int dy)
 PATHNODE *path_get_node2(int dx, int dy)
 {
 	PATHNODE *result = pnode_ptr->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;
 }
 
 /**