Fix selection of non-matching candidates