Added ability to retry on default