reorder fixes