Fix order of completed orders, again