More robust regexp
More robust regexp