Good catch oldValue should be returned