For #738 and now match \r