fixed retry issues