fixed for regex matching