fixed regular expr to take all values