fixed regexp matching