PCRE UTF-8 fix take 2