improve regex pattern :D