Fix the field name, upstream changes