Refine regexp

Change-Id: I5310aec3badeeef129cfb6c11250ebf170163a40