Change RegExp; fix