Fix the path finding