DDF-416 Correct logic to break out of loop on success