Regex issue fix