Fixed processing custom fields (2)