Fix #4757 only resolve at exit-fn when the candidate requires resolution#4763