Fix field ordering.