Fix ignore_candidates()
Merge from master