Fixed regex validation 2nd pass issue