Fixed reorder issue