Adding retries to check hangs