Fix and reorder