Fixed handling of OverrideValue