1.4b improved regex