Fix for multiple custom fields