updated regex issue