fixed infinite retry