Fixed reordering