some regexp related fix