Another fix for the retry issue