One more replace_or_add fix.