New regexp, seems to be better