fix regexp problem
fix regexp problem part2