fix custom fields