target: improve robustness of polling and reexamination