Refactor: just return last result
Missing tie check