Avoid re-fetching when numbers mismatch and we are not renaming