add retries in additional cases