Reorder bug fixed