Previous regex was overkill