Fix the Reorder Bug