Fix bug when choose to retry