Made a different regex for #605.