retry logic fix;