fix order of fields