Fix a reordering bug