fixes #3178

do we need ```oldValue```? If not, can you please remove it?