Reorder fix