fix to the regex added re issue 1836

I think this fixes 1848 & 1849.