Closes #2360. Fix tiebreaking.