client reorder fix