retry bug fixes