New RegExp should be used in two places...