Fix handle extraFields