Fixed regression with whole value regex not properly getting applied