Added stronger RegExp