removed infinite retry attempts