revert to previous regexp; added regression test