fixed regexp, removed XRegExp dep