Use the proper fields.