fix reordering issue