A little change of regular expression - for better matching