better retries workaround