Correct unstructured logic, but unstructured runner is still broken