fixed more regex cases