Some more fiddling with the regex