Corrected automatic ordering