Added another retry loop workaround.