Fix regexp issue