Reorder and fix sample