Improve regexp perf
v1.0.1