added isValueMatch check before disabling