fixed regexp part..