Correctly order the fields in export (see #10)