Fix(?) the ordering?