Fix order of fields