Fix field order.