Fixed problem with regexps