Added check to retry the choose race switch