Fixed processing custom fields