Fixing the next race bug, plus removed any potential of finding the wrong candidate