Followup r108425, r108426