Chan the regex be changed so we don't have to do this?