Fixed (hopefully) the regex misses