Fixed issue with reorder