Fixed problem with Retry option