fixed reordering