Fix bug where we sometimes try to claim for the wrong address