Fix reorder bug