Fixed Retry Functionality