Fix for path finding