handle no custom fields case