Looks like this should be using `FIELD_ORDER_LOOKUP` - ?