Removing incorrect update of rid/key values