Order retry mechanism improved